Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -920,39 +920,37 @@
 AC_DEFUN([ENCODING_FLAG], [
 	AC_ARG_ENABLE($1,
 		AS_HELP_STRING([--disable-$1],
 			[Disables support for $3]))
 	AS_IF([test x"$enable_$2" != x"no"], [
-		AC_DEFINE($4, 1,
-			[Whether we have support for $3])
-		ENCODINGS_SRCS="$ENCODINGS_SRCS $2.m"
+		AC_DEFINE($4, 1, [Whether we have support for $3])
+		ENCODINGS_SRCS="$ENCODINGS_SRCS $1.m"
 	])
 ])
 ENCODING_FLAG(codepage-437, codepage_437, [Codepage 437], HAVE_CODEPAGE_437)
 ENCODING_FLAG(codepage-850, codepage_850, [Codepage 850], HAVE_CODEPAGE_850)
 ENCODING_FLAG(codepage-858, codepage_858, [Codepage 858], HAVE_CODEPAGE_858)
-ENCODING_FLAG(iso-8859-2, iso_8859-2, [ISO 8859-2], HAVE_ISO_8859_2)
-ENCODING_FLAG(iso-8859-3, iso_8859-3, [ISO 8859-3], HAVE_ISO_8859_3)
-ENCODING_FLAG(iso-8859-15, iso_8859-15, [ISO 8859-15], HAVE_ISO_8859_15)
-ENCODING_FLAG(koi8-r, koi8-r, [KOI8-R], HAVE_KOI8_R)
-ENCODING_FLAG(koi8-u, koi8-u, [KOI8-U], HAVE_KOI8_U)
+ENCODING_FLAG(iso-8859-2, iso_8859_2, [ISO 8859-2], HAVE_ISO_8859_2)
+ENCODING_FLAG(iso-8859-3, iso_8859_3, [ISO 8859-3], HAVE_ISO_8859_3)
+ENCODING_FLAG(iso-8859-15, iso_8859_15, [ISO 8859-15], HAVE_ISO_8859_15)
+ENCODING_FLAG(koi8-r, koi8_r, [KOI8-R], HAVE_KOI8_R)
+ENCODING_FLAG(koi8-u, koi8_u, [KOI8-U], HAVE_KOI8_U)
 ENCODING_FLAG(mac-roman, mac_roman, [Mac Roman encoding], HAVE_MAC_ROMAN)
-ENCODING_FLAG(windows-1251, windows-1251, [Windows-1251], HAVE_WINDOWS_1251)
-ENCODING_FLAG(windows-1252, windows-1252, [Windows-1252], HAVE_WINDOWS_1252)
+ENCODING_FLAG(windows-1251, windows_1251, [Windows-1251], HAVE_WINDOWS_1251)
+ENCODING_FLAG(windows-1252, windows_1252, [Windows-1252], HAVE_WINDOWS_1252)
 
+AS_IF([test x"$ENCODINGS_SRCS" = x""], [
+	ENCODINGS_SRCS="dummy.m"
+])
 AC_SUBST(ENCODINGS_SRCS)
-AS_IF([test x"$ENCODINGS_SRCS" != x""], [
-	AC_SUBST(ENCODINGS, "encodings")
-
-	AS_IF([test x"$enable_shared" != x"no"], [
-		AC_SUBST(ENCODINGS_LIB_A, "encodings.lib.a")
-		AC_SUBST(ENCODINGS_ENCODINGS_LIB_A, "encodings/encodings.lib.a")
-	])
-	AS_IF([test x"$enable_static" = x"yes" -o x"$enable_shared" = x"no"], [
-		AC_SUBST(ENCODINGS_A, "encodings.a")
-		AC_SUBST(ENCODINGS_ENCODINGS_A, "encodings/encodings.a")
-	])
+AS_IF([test x"$enable_shared" != x"no"], [
+	AC_SUBST(ENCODINGS_LIB_A, "encodings.lib.a")
+	AC_SUBST(ENCODINGS_ENCODINGS_LIB_A, "encodings/encodings.lib.a")
+])
+AS_IF([test x"$enable_static" = x"yes" -o x"$enable_shared" = x"no"], [
+	AC_SUBST(ENCODINGS_A, "encodings.a")
+	AC_SUBST(ENCODINGS_ENCODINGS_A, "encodings/encodings.a")
 ])
 
 AC_CHECK_FUNCS(arc4random arc4random_buf getrandom random, break)
 
 AS_IF([test x"$host_os" != x"morphos"], [

Index: extra.mk.in
==================================================================
--- extra.mk.in
+++ extra.mk.in
@@ -18,11 +18,10 @@
 OBJFWBRIDGE_FRAMEWORK = @OBJFWBRIDGE_FRAMEWORK@
 
 BIN_PREFIX = @BIN_PREFIX@
 BRIDGE = @BRIDGE@
 CVINCLUDE_INLINE_H = @CVINCLUDE_INLINE_H@
-ENCODINGS = @ENCODINGS@
 ENCODINGS_A = @ENCODINGS_A@
 ENCODINGS_LIB_A = @ENCODINGS_LIB_A@
 ENCODINGS_SRCS = @ENCODINGS_SRCS@
 EXCEPTIONS_A = @EXCEPTIONS_A@
 EXCEPTIONS_LIB_A = @EXCEPTIONS_LIB_A@

Index: src/Makefile
==================================================================
--- src/Makefile
+++ src/Makefile
@@ -1,8 +1,8 @@
 include ../extra.mk
 
-SUBDIRS = ${RUNTIME} exceptions ${ENCODINGS} forwarding invocation
+SUBDIRS = ${RUNTIME} exceptions encodings forwarding invocation
 SUBDIRS_AFTER = ${BRIDGE}
 DISTCLEAN = Info.plist objfw-defs.h
 
 SHARED_LIB = ${OBJFW_SHARED_LIB}
 STATIC_LIB = ${OBJFW_STATIC_LIB}

ADDED   src/encodings/codepage-437.m
Index: src/encodings/codepage-437.m
==================================================================
--- src/encodings/codepage-437.m
+++ src/encodings/codepage-437.m
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
+ *               2018, 2019, 2020
+ *   Jonathan Schleifer <js@nil.im>
+ *
+ * All rights reserved.
+ *
+ * This file is part of ObjFW. It may be distributed under the terms of the
+ * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
+ * the packaging of this file.
+ *
+ * Alternatively, it may be distributed under the terms of the GNU General
+ * Public License, either version 2 or 3, which can be found in the file
+ * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
+ * file.
+ */
+
+#include "config.h"
+
+#import "OFString.h"
+
+#import "common.h"
+
+const of_char16_t of_codepage_437_table[] = {
+	0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
+	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
+	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
+	0x00FF, 0x00D6, 0x00DC, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192,
+	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
+	0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
+	0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+	0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
+	0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+	0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4,
+	0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229,
+	0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248,
+	0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
+};
+const size_t of_codepage_437_table_offset =
+    256 - (sizeof(of_codepage_437_table) / sizeof(*of_codepage_437_table));
+
+static const unsigned char page0[] = {
+	0xFF, 0xAD, 0x9B, 0x9C, 0x00, 0x9D, 0x00, 0x00,
+	0x00, 0x00, 0xA6, 0xAE, 0xAA, 0x00, 0x00, 0x00,
+	0xF8, 0xF1, 0xFD, 0x00, 0x00, 0xE6, 0x00, 0xFA,
+	0x00, 0x00, 0xA7, 0xAF, 0xAC, 0xAB, 0x00, 0xA8,
+	0x00, 0x00, 0x00, 0x00, 0x8E, 0x8F, 0x92, 0x80,
+	0x00, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xA5, 0x00, 0x00, 0x00, 0x00, 0x99, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x9A, 0x00, 0x00, 0xE1,
+	0x85, 0xA0, 0x83, 0x00, 0x84, 0x86, 0x91, 0x87,
+	0x8A, 0x82, 0x88, 0x89, 0x8D, 0xA1, 0x8C, 0x8B,
+	0x00, 0xA4, 0x95, 0xA2, 0x93, 0x00, 0x94, 0xF6,
+	0x00, 0x97, 0xA3, 0x96, 0x81, 0x00, 0x00, 0x98
+};
+static const uint8_t page0Start = 0xA0;
+
+static const unsigned char page1[] = {
+	0x9F
+};
+static const uint8_t page1Start = 0x92;
+
+static const unsigned char page3[] = {
+	0xE2, 0x00, 0x00, 0x00, 0x00, 0xE9, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xE4, 0x00, 0x00, 0xE8, 0x00, 0x00, 0xEA, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00,
+	0x00, 0xEB, 0xEE, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xE3, 0x00, 0x00,
+	0xE5, 0xE7, 0x00, 0xED
+};
+static const uint8_t page3Start = 0x93;
+
+static const unsigned char page20[] = {
+	0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x9E
+};
+static const uint8_t page20Start = 0x7F;
+
+static const unsigned char page22[] = {
+	0xF9, 0xFB, 0x00, 0x00, 0x00, 0xEC, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xF0, 0x00, 0x00, 0xF3, 0xF2
+};
+static const uint8_t page22Start = 0x19;
+
+static const unsigned char page23[] = {
+	0xA9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xF4, 0xF5
+};
+static const uint8_t page23Start = 0x10;
+
+static const unsigned char page25[] = {
+	0xC4, 0x00, 0xB3, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xDA, 0x00, 0x00, 0x00,
+	0xBF, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00,
+	0xD9, 0x00, 0x00, 0x00, 0xC3, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xC2, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xC1, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xC5, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xCD, 0xBA, 0xD5, 0xD6, 0xC9, 0xB8, 0xB7, 0xBB,
+	0xD4, 0xD3, 0xC8, 0xBE, 0xBD, 0xBC, 0xC6, 0xC7,
+	0xCC, 0xB5, 0xB6, 0xB9, 0xD1, 0xD2, 0xCB, 0xCF,
+	0xD0, 0xCA, 0xD8, 0xD7, 0xCE, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xDF, 0x00, 0x00, 0x00, 0xDC, 0x00, 0x00, 0x00,
+	0xDB, 0x00, 0x00, 0x00, 0xDD, 0x00, 0x00, 0x00,
+	0xDE, 0xB0, 0xB1, 0xB2, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xFE
+};
+static const uint8_t page25Start = 0x00;
+
+bool
+of_unicode_to_codepage_437(const of_unichar_t *input, unsigned char *output,
+    size_t length, bool lossy)
+{
+	for (size_t i = 0; i < length; i++) {
+		of_unichar_t c = input[i];
+
+		if OF_UNLIKELY (c > 0x7F) {
+			uint8_t idx;
+
+			if OF_UNLIKELY (c > 0xFFFF) {
+				if (lossy) {
+					output[i] = '?';
+					continue;
+				} else
+					return false;
+			}
+
+			switch (c >> 8) {
+			CASE_MISSING_IS_ERROR(0)
+			CASE_MISSING_IS_ERROR(1)
+			CASE_MISSING_IS_ERROR(3)
+			CASE_MISSING_IS_ERROR(20)
+			CASE_MISSING_IS_ERROR(22)
+			CASE_MISSING_IS_ERROR(23)
+			CASE_MISSING_IS_ERROR(25)
+			default:
+				if (lossy) {
+					output[i] = '?';
+					continue;
+				} else
+					return false;
+			}
+		} else
+			output[i] = (unsigned char)c;
+	}
+
+	return true;
+}

ADDED   src/encodings/codepage-850.m
Index: src/encodings/codepage-850.m
==================================================================
--- src/encodings/codepage-850.m
+++ src/encodings/codepage-850.m
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
+ *               2018, 2019, 2020
+ *   Jonathan Schleifer <js@nil.im>
+ *
+ * All rights reserved.
+ *
+ * This file is part of ObjFW. It may be distributed under the terms of the
+ * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
+ * the packaging of this file.
+ *
+ * Alternatively, it may be distributed under the terms of the GNU General
+ * Public License, either version 2 or 3, which can be found in the file
+ * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
+ * file.
+ */
+
+#include "config.h"
+
+#import "OFString.h"
+
+#import "common.h"
+
+const of_char16_t of_codepage_850_table[] = {
+	0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
+	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
+	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
+	0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192,
+	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
+	0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0,
+	0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
+	0x00F0, 0x00D0, 0x00CA, 0x00CB, 0x00C8, 0x0131, 0x00CD, 0x00CE,
+	0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580,
+	0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE,
+	0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4,
+	0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8,
+	0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
+};
+const size_t of_codepage_850_table_offset =
+    256 - (sizeof(of_codepage_850_table) / sizeof(*of_codepage_850_table));
+
+
+static const unsigned char page0[] = {
+	0xFF, 0xAD, 0xBD, 0x9C, 0xCF, 0xBE, 0xDD, 0xF5,
+	0xF9, 0xB8, 0xA6, 0xAE, 0xAA, 0xF0, 0xA9, 0xEE,
+	0xF8, 0xF1, 0xFD, 0xFC, 0xEF, 0xE6, 0xF4, 0xFA,
+	0xF7, 0xFB, 0xA7, 0xAF, 0xAC, 0xAB, 0xF3, 0xA8,
+	0xB7, 0xB5, 0xB6, 0xC7, 0x8E, 0x8F, 0x92, 0x80,
+	0xD4, 0x90, 0xD2, 0xD3, 0xDE, 0xD6, 0xD7, 0xD8,
+	0xD1, 0xA5, 0xE3, 0xE0, 0xE2, 0xE5, 0x99, 0x9E,
+	0x9D, 0xEB, 0xE9, 0xEA, 0x9A, 0xED, 0xE8, 0xE1,
+	0x85, 0xA0, 0x83, 0xC6, 0x84, 0x86, 0x91, 0x87,
+	0x8A, 0x82, 0x88, 0x89, 0x8D, 0xA1, 0x8C, 0x8B,
+	0xD0, 0xA4, 0x95, 0xA2, 0x93, 0xE4, 0x94, 0xF6,
+	0x9B, 0x97, 0xA3, 0x96, 0x81, 0xEC, 0xE7, 0x98
+};
+static const uint8_t page0Start = 0xA0;
+
+static const unsigned char page1[] = {
+	0xD5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x9F
+};
+static const uint8_t page1Start = 0x31;
+
+static const unsigned char page20[] = {
+	0xF2
+};
+static const uint8_t page20Start = 0x17;
+
+static const unsigned char page25[] = {
+	0xC4, 0x00, 0xB3, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xDA, 0x00, 0x00, 0x00,
+	0xBF, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00,
+	0xD9, 0x00, 0x00, 0x00, 0xC3, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xC2, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xC1, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xC5, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xCD, 0xBA, 0x00, 0x00, 0xC9, 0x00, 0x00, 0xBB,
+	0x00, 0x00, 0xC8, 0x00, 0x00, 0xBC, 0x00, 0x00,
+	0xCC, 0x00, 0x00, 0xB9, 0x00, 0x00, 0xCB, 0x00,
+	0x00, 0xCA, 0x00, 0x00, 0xCE, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xDF, 0x00, 0x00, 0x00, 0xDC, 0x00, 0x00, 0x00,
+	0xDB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xB0, 0xB1, 0xB2, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xFE
+};
+static const uint8_t page25Start = 0x00;
+
+bool
+of_unicode_to_codepage_850(const of_unichar_t *input, unsigned char *output,
+    size_t length, bool lossy)
+{
+	for (size_t i = 0; i < length; i++) {
+		of_unichar_t c = input[i];
+
+		if OF_UNLIKELY (c > 0x7F) {
+			uint8_t idx;
+
+			if OF_UNLIKELY (c > 0xFFFF) {
+				if (lossy) {
+					output[i] = '?';
+					continue;
+				} else
+					return false;
+			}
+
+			switch (c >> 8) {
+			CASE_MISSING_IS_ERROR(0)
+			CASE_MISSING_IS_ERROR(1)
+			CASE_MISSING_IS_ERROR(20)
+			CASE_MISSING_IS_ERROR(25)
+			default:
+				if (lossy) {
+					output[i] = '?';
+					continue;
+				} else
+					return false;
+			}
+		} else
+			output[i] = (unsigned char)c;
+	}
+
+	return true;
+}

ADDED   src/encodings/codepage-858.m
Index: src/encodings/codepage-858.m
==================================================================
--- src/encodings/codepage-858.m
+++ src/encodings/codepage-858.m
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
+ *               2018, 2019, 2020
+ *   Jonathan Schleifer <js@nil.im>
+ *
+ * All rights reserved.
+ *
+ * This file is part of ObjFW. It may be distributed under the terms of the
+ * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
+ * the packaging of this file.
+ *
+ * Alternatively, it may be distributed under the terms of the GNU General
+ * Public License, either version 2 or 3, which can be found in the file
+ * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
+ * file.
+ */
+
+#include "config.h"
+
+#import "OFString.h"
+
+#import "common.h"
+
+const of_char16_t of_codepage_858_table[] = {
+	0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
+	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
+	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
+	0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192,
+	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
+	0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0,
+	0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510,
+	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3,
+	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
+	0x00F0, 0x00D0, 0x00CA, 0x00CB, 0x00C8, 0x20AC, 0x00CD, 0x00CE,
+	0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580,
+	0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE,
+	0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4,
+	0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8,
+	0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
+};
+const size_t of_codepage_858_table_offset =
+    256 - (sizeof(of_codepage_858_table) / sizeof(*of_codepage_858_table));
+
+
+static const unsigned char page0[] = {
+	0xFF, 0xAD, 0xBD, 0x9C, 0xCF, 0xBE, 0xDD, 0xF5,
+	0xF9, 0xB8, 0xA6, 0xAE, 0xAA, 0xF0, 0xA9, 0xEE,
+	0xF8, 0xF1, 0xFD, 0xFC, 0xEF, 0xE6, 0xF4, 0xFA,
+	0xF7, 0xFB, 0xA7, 0xAF, 0xAC, 0xAB, 0xF3, 0xA8,
+	0xB7, 0xB5, 0xB6, 0xC7, 0x8E, 0x8F, 0x92, 0x80,
+	0xD4, 0x90, 0xD2, 0xD3, 0xDE, 0xD6, 0xD7, 0xD8,
+	0xD1, 0xA5, 0xE3, 0xE0, 0xE2, 0xE5, 0x99, 0x9E,
+	0x9D, 0xEB, 0xE9, 0xEA, 0x9A, 0xED, 0xE8, 0xE1,
+	0x85, 0xA0, 0x83, 0xC6, 0x84, 0x86, 0x91, 0x87,
+	0x8A, 0x82, 0x88, 0x89, 0x8D, 0xA1, 0x8C, 0x8B,
+	0xD0, 0xA4, 0x95, 0xA2, 0x93, 0xE4, 0x94, 0xF6,
+	0x9B, 0x97, 0xA3, 0x96, 0x81, 0xEC, 0xE7, 0x98
+};
+static const uint8_t page0Start = 0xA0;
+
+static const unsigned char page1[] = {
+	0x9F
+};
+static const uint8_t page1Start = 0x92;
+
+static const unsigned char page20[] = {
+	0xF2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xD5
+};
+static const uint8_t page20Start = 0x17;
+
+static const unsigned char page25[] = {
+	0xC4, 0x00, 0xB3, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xDA, 0x00, 0x00, 0x00,
+	0xBF, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00,
+	0xD9, 0x00, 0x00, 0x00, 0xC3, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xC2, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xC1, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xC5, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xCD, 0xBA, 0x00, 0x00, 0xC9, 0x00, 0x00, 0xBB,
+	0x00, 0x00, 0xC8, 0x00, 0x00, 0xBC, 0x00, 0x00,
+	0xCC, 0x00, 0x00, 0xB9, 0x00, 0x00, 0xCB, 0x00,
+	0x00, 0xCA, 0x00, 0x00, 0xCE, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xDF, 0x00, 0x00, 0x00, 0xDC, 0x00, 0x00, 0x00,
+	0xDB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xB0, 0xB1, 0xB2, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xFE
+};
+static const uint8_t page25Start = 0x00;
+
+bool
+of_unicode_to_codepage_858(const of_unichar_t *input, unsigned char *output,
+    size_t length, bool lossy)
+{
+	for (size_t i = 0; i < length; i++) {
+		of_unichar_t c = input[i];
+
+		if OF_UNLIKELY (c > 0x7F) {
+			uint8_t idx;
+
+			if OF_UNLIKELY (c > 0xFFFF) {
+				if (lossy) {
+					output[i] = '?';
+					continue;
+				} else
+					return false;
+			}
+
+			switch (c >> 8) {
+			CASE_MISSING_IS_ERROR(0)
+			CASE_MISSING_IS_ERROR(1)
+			CASE_MISSING_IS_ERROR(20)
+			CASE_MISSING_IS_ERROR(25)
+			default:
+				if (lossy) {
+					output[i] = '?';
+					continue;
+				} else
+					return false;
+			}
+		} else
+			output[i] = (unsigned char)c;
+	}
+
+	return true;
+}

DELETED src/encodings/codepage_437.m
Index: src/encodings/codepage_437.m
==================================================================
--- src/encodings/codepage_437.m
+++ src/encodings/codepage_437.m
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
- *               2018, 2019, 2020
- *   Jonathan Schleifer <js@nil.im>
- *
- * All rights reserved.
- *
- * This file is part of ObjFW. It may be distributed under the terms of the
- * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
- * the packaging of this file.
- *
- * Alternatively, it may be distributed under the terms of the GNU General
- * Public License, either version 2 or 3, which can be found in the file
- * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
- * file.
- */
-
-#include "config.h"
-
-#import "OFString.h"
-
-#import "common.h"
-
-const of_char16_t of_codepage_437_table[] = {
-	0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
-	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
-	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
-	0x00FF, 0x00D6, 0x00DC, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192,
-	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
-	0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
-	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
-	0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
-	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
-	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
-	0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
-	0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
-	0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4,
-	0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229,
-	0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248,
-	0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
-};
-const size_t of_codepage_437_table_offset =
-    256 - (sizeof(of_codepage_437_table) / sizeof(*of_codepage_437_table));
-
-static const unsigned char page0[] = {
-	0xFF, 0xAD, 0x9B, 0x9C, 0x00, 0x9D, 0x00, 0x00,
-	0x00, 0x00, 0xA6, 0xAE, 0xAA, 0x00, 0x00, 0x00,
-	0xF8, 0xF1, 0xFD, 0x00, 0x00, 0xE6, 0x00, 0xFA,
-	0x00, 0x00, 0xA7, 0xAF, 0xAC, 0xAB, 0x00, 0xA8,
-	0x00, 0x00, 0x00, 0x00, 0x8E, 0x8F, 0x92, 0x80,
-	0x00, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0xA5, 0x00, 0x00, 0x00, 0x00, 0x99, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x9A, 0x00, 0x00, 0xE1,
-	0x85, 0xA0, 0x83, 0x00, 0x84, 0x86, 0x91, 0x87,
-	0x8A, 0x82, 0x88, 0x89, 0x8D, 0xA1, 0x8C, 0x8B,
-	0x00, 0xA4, 0x95, 0xA2, 0x93, 0x00, 0x94, 0xF6,
-	0x00, 0x97, 0xA3, 0x96, 0x81, 0x00, 0x00, 0x98
-};
-static const uint8_t page0Start = 0xA0;
-
-static const unsigned char page1[] = {
-	0x9F
-};
-static const uint8_t page1Start = 0x92;
-
-static const unsigned char page3[] = {
-	0xE2, 0x00, 0x00, 0x00, 0x00, 0xE9, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xE4, 0x00, 0x00, 0xE8, 0x00, 0x00, 0xEA, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00,
-	0x00, 0xEB, 0xEE, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0xE3, 0x00, 0x00,
-	0xE5, 0xE7, 0x00, 0xED
-};
-static const uint8_t page3Start = 0x93;
-
-static const unsigned char page20[] = {
-	0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x9E
-};
-static const uint8_t page20Start = 0x7F;
-
-static const unsigned char page22[] = {
-	0xF9, 0xFB, 0x00, 0x00, 0x00, 0xEC, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xF0, 0x00, 0x00, 0xF3, 0xF2
-};
-static const uint8_t page22Start = 0x19;
-
-static const unsigned char page23[] = {
-	0xA9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xF4, 0xF5
-};
-static const uint8_t page23Start = 0x10;
-
-static const unsigned char page25[] = {
-	0xC4, 0x00, 0xB3, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xDA, 0x00, 0x00, 0x00,
-	0xBF, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00,
-	0xD9, 0x00, 0x00, 0x00, 0xC3, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xC2, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xC1, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xC5, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xCD, 0xBA, 0xD5, 0xD6, 0xC9, 0xB8, 0xB7, 0xBB,
-	0xD4, 0xD3, 0xC8, 0xBE, 0xBD, 0xBC, 0xC6, 0xC7,
-	0xCC, 0xB5, 0xB6, 0xB9, 0xD1, 0xD2, 0xCB, 0xCF,
-	0xD0, 0xCA, 0xD8, 0xD7, 0xCE, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xDF, 0x00, 0x00, 0x00, 0xDC, 0x00, 0x00, 0x00,
-	0xDB, 0x00, 0x00, 0x00, 0xDD, 0x00, 0x00, 0x00,
-	0xDE, 0xB0, 0xB1, 0xB2, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xFE
-};
-static const uint8_t page25Start = 0x00;
-
-bool
-of_unicode_to_codepage_437(const of_unichar_t *input, unsigned char *output,
-    size_t length, bool lossy)
-{
-	for (size_t i = 0; i < length; i++) {
-		of_unichar_t c = input[i];
-
-		if OF_UNLIKELY (c > 0x7F) {
-			uint8_t idx;
-
-			if OF_UNLIKELY (c > 0xFFFF) {
-				if (lossy) {
-					output[i] = '?';
-					continue;
-				} else
-					return false;
-			}
-
-			switch (c >> 8) {
-			CASE_MISSING_IS_ERROR(0)
-			CASE_MISSING_IS_ERROR(1)
-			CASE_MISSING_IS_ERROR(3)
-			CASE_MISSING_IS_ERROR(20)
-			CASE_MISSING_IS_ERROR(22)
-			CASE_MISSING_IS_ERROR(23)
-			CASE_MISSING_IS_ERROR(25)
-			default:
-				if (lossy) {
-					output[i] = '?';
-					continue;
-				} else
-					return false;
-			}
-		} else
-			output[i] = (unsigned char)c;
-	}
-
-	return true;
-}

DELETED src/encodings/codepage_850.m
Index: src/encodings/codepage_850.m
==================================================================
--- src/encodings/codepage_850.m
+++ src/encodings/codepage_850.m
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
- *               2018, 2019, 2020
- *   Jonathan Schleifer <js@nil.im>
- *
- * All rights reserved.
- *
- * This file is part of ObjFW. It may be distributed under the terms of the
- * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
- * the packaging of this file.
- *
- * Alternatively, it may be distributed under the terms of the GNU General
- * Public License, either version 2 or 3, which can be found in the file
- * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
- * file.
- */
-
-#include "config.h"
-
-#import "OFString.h"
-
-#import "common.h"
-
-const of_char16_t of_codepage_850_table[] = {
-	0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
-	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
-	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
-	0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192,
-	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
-	0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
-	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0,
-	0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510,
-	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3,
-	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
-	0x00F0, 0x00D0, 0x00CA, 0x00CB, 0x00C8, 0x0131, 0x00CD, 0x00CE,
-	0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580,
-	0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE,
-	0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4,
-	0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8,
-	0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
-};
-const size_t of_codepage_850_table_offset =
-    256 - (sizeof(of_codepage_850_table) / sizeof(*of_codepage_850_table));
-
-
-static const unsigned char page0[] = {
-	0xFF, 0xAD, 0xBD, 0x9C, 0xCF, 0xBE, 0xDD, 0xF5,
-	0xF9, 0xB8, 0xA6, 0xAE, 0xAA, 0xF0, 0xA9, 0xEE,
-	0xF8, 0xF1, 0xFD, 0xFC, 0xEF, 0xE6, 0xF4, 0xFA,
-	0xF7, 0xFB, 0xA7, 0xAF, 0xAC, 0xAB, 0xF3, 0xA8,
-	0xB7, 0xB5, 0xB6, 0xC7, 0x8E, 0x8F, 0x92, 0x80,
-	0xD4, 0x90, 0xD2, 0xD3, 0xDE, 0xD6, 0xD7, 0xD8,
-	0xD1, 0xA5, 0xE3, 0xE0, 0xE2, 0xE5, 0x99, 0x9E,
-	0x9D, 0xEB, 0xE9, 0xEA, 0x9A, 0xED, 0xE8, 0xE1,
-	0x85, 0xA0, 0x83, 0xC6, 0x84, 0x86, 0x91, 0x87,
-	0x8A, 0x82, 0x88, 0x89, 0x8D, 0xA1, 0x8C, 0x8B,
-	0xD0, 0xA4, 0x95, 0xA2, 0x93, 0xE4, 0x94, 0xF6,
-	0x9B, 0x97, 0xA3, 0x96, 0x81, 0xEC, 0xE7, 0x98
-};
-static const uint8_t page0Start = 0xA0;
-
-static const unsigned char page1[] = {
-	0xD5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x9F
-};
-static const uint8_t page1Start = 0x31;
-
-static const unsigned char page20[] = {
-	0xF2
-};
-static const uint8_t page20Start = 0x17;
-
-static const unsigned char page25[] = {
-	0xC4, 0x00, 0xB3, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xDA, 0x00, 0x00, 0x00,
-	0xBF, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00,
-	0xD9, 0x00, 0x00, 0x00, 0xC3, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xC2, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xC1, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xC5, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xCD, 0xBA, 0x00, 0x00, 0xC9, 0x00, 0x00, 0xBB,
-	0x00, 0x00, 0xC8, 0x00, 0x00, 0xBC, 0x00, 0x00,
-	0xCC, 0x00, 0x00, 0xB9, 0x00, 0x00, 0xCB, 0x00,
-	0x00, 0xCA, 0x00, 0x00, 0xCE, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xDF, 0x00, 0x00, 0x00, 0xDC, 0x00, 0x00, 0x00,
-	0xDB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0xB0, 0xB1, 0xB2, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xFE
-};
-static const uint8_t page25Start = 0x00;
-
-bool
-of_unicode_to_codepage_850(const of_unichar_t *input, unsigned char *output,
-    size_t length, bool lossy)
-{
-	for (size_t i = 0; i < length; i++) {
-		of_unichar_t c = input[i];
-
-		if OF_UNLIKELY (c > 0x7F) {
-			uint8_t idx;
-
-			if OF_UNLIKELY (c > 0xFFFF) {
-				if (lossy) {
-					output[i] = '?';
-					continue;
-				} else
-					return false;
-			}
-
-			switch (c >> 8) {
-			CASE_MISSING_IS_ERROR(0)
-			CASE_MISSING_IS_ERROR(1)
-			CASE_MISSING_IS_ERROR(20)
-			CASE_MISSING_IS_ERROR(25)
-			default:
-				if (lossy) {
-					output[i] = '?';
-					continue;
-				} else
-					return false;
-			}
-		} else
-			output[i] = (unsigned char)c;
-	}
-
-	return true;
-}

DELETED src/encodings/codepage_858.m
Index: src/encodings/codepage_858.m
==================================================================
--- src/encodings/codepage_858.m
+++ src/encodings/codepage_858.m
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
- *               2018, 2019, 2020
- *   Jonathan Schleifer <js@nil.im>
- *
- * All rights reserved.
- *
- * This file is part of ObjFW. It may be distributed under the terms of the
- * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
- * the packaging of this file.
- *
- * Alternatively, it may be distributed under the terms of the GNU General
- * Public License, either version 2 or 3, which can be found in the file
- * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
- * file.
- */
-
-#include "config.h"
-
-#import "OFString.h"
-
-#import "common.h"
-
-const of_char16_t of_codepage_858_table[] = {
-	0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
-	0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
-	0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9,
-	0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192,
-	0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA,
-	0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
-	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0,
-	0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510,
-	0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3,
-	0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
-	0x00F0, 0x00D0, 0x00CA, 0x00CB, 0x00C8, 0x20AC, 0x00CD, 0x00CE,
-	0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580,
-	0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE,
-	0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4,
-	0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8,
-	0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0
-};
-const size_t of_codepage_858_table_offset =
-    256 - (sizeof(of_codepage_858_table) / sizeof(*of_codepage_858_table));
-
-
-static const unsigned char page0[] = {
-	0xFF, 0xAD, 0xBD, 0x9C, 0xCF, 0xBE, 0xDD, 0xF5,
-	0xF9, 0xB8, 0xA6, 0xAE, 0xAA, 0xF0, 0xA9, 0xEE,
-	0xF8, 0xF1, 0xFD, 0xFC, 0xEF, 0xE6, 0xF4, 0xFA,
-	0xF7, 0xFB, 0xA7, 0xAF, 0xAC, 0xAB, 0xF3, 0xA8,
-	0xB7, 0xB5, 0xB6, 0xC7, 0x8E, 0x8F, 0x92, 0x80,
-	0xD4, 0x90, 0xD2, 0xD3, 0xDE, 0xD6, 0xD7, 0xD8,
-	0xD1, 0xA5, 0xE3, 0xE0, 0xE2, 0xE5, 0x99, 0x9E,
-	0x9D, 0xEB, 0xE9, 0xEA, 0x9A, 0xED, 0xE8, 0xE1,
-	0x85, 0xA0, 0x83, 0xC6, 0x84, 0x86, 0x91, 0x87,
-	0x8A, 0x82, 0x88, 0x89, 0x8D, 0xA1, 0x8C, 0x8B,
-	0xD0, 0xA4, 0x95, 0xA2, 0x93, 0xE4, 0x94, 0xF6,
-	0x9B, 0x97, 0xA3, 0x96, 0x81, 0xEC, 0xE7, 0x98
-};
-static const uint8_t page0Start = 0xA0;
-
-static const unsigned char page1[] = {
-	0x9F
-};
-static const uint8_t page1Start = 0x92;
-
-static const unsigned char page20[] = {
-	0xF2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0xD5
-};
-static const uint8_t page20Start = 0x17;
-
-static const unsigned char page25[] = {
-	0xC4, 0x00, 0xB3, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xDA, 0x00, 0x00, 0x00,
-	0xBF, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00,
-	0xD9, 0x00, 0x00, 0x00, 0xC3, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xC2, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xC1, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xC5, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xCD, 0xBA, 0x00, 0x00, 0xC9, 0x00, 0x00, 0xBB,
-	0x00, 0x00, 0xC8, 0x00, 0x00, 0xBC, 0x00, 0x00,
-	0xCC, 0x00, 0x00, 0xB9, 0x00, 0x00, 0xCB, 0x00,
-	0x00, 0xCA, 0x00, 0x00, 0xCE, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xDF, 0x00, 0x00, 0x00, 0xDC, 0x00, 0x00, 0x00,
-	0xDB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0xB0, 0xB1, 0xB2, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xFE
-};
-static const uint8_t page25Start = 0x00;
-
-bool
-of_unicode_to_codepage_858(const of_unichar_t *input, unsigned char *output,
-    size_t length, bool lossy)
-{
-	for (size_t i = 0; i < length; i++) {
-		of_unichar_t c = input[i];
-
-		if OF_UNLIKELY (c > 0x7F) {
-			uint8_t idx;
-
-			if OF_UNLIKELY (c > 0xFFFF) {
-				if (lossy) {
-					output[i] = '?';
-					continue;
-				} else
-					return false;
-			}
-
-			switch (c >> 8) {
-			CASE_MISSING_IS_ERROR(0)
-			CASE_MISSING_IS_ERROR(1)
-			CASE_MISSING_IS_ERROR(20)
-			CASE_MISSING_IS_ERROR(25)
-			default:
-				if (lossy) {
-					output[i] = '?';
-					continue;
-				} else
-					return false;
-			}
-		} else
-			output[i] = (unsigned char)c;
-	}
-
-	return true;
-}

ADDED   src/encodings/iso-8859-15.m
Index: src/encodings/iso-8859-15.m
==================================================================
--- src/encodings/iso-8859-15.m
+++ src/encodings/iso-8859-15.m
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
+ *               2018, 2019, 2020
+ *   Jonathan Schleifer <js@nil.im>
+ *
+ * All rights reserved.
+ *
+ * This file is part of ObjFW. It may be distributed under the terms of the
+ * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
+ * the packaging of this file.
+ *
+ * Alternatively, it may be distributed under the terms of the GNU General
+ * Public License, either version 2 or 3, which can be found in the file
+ * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
+ * file.
+ */
+
+#include "config.h"
+
+#import "OFString.h"
+
+#import "common.h"
+
+const of_char16_t of_iso_8859_15_table[] = {
+	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AC, 0x00A5, 0x0160, 0x00A7,
+	0x0161, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x017D, 0x00B5, 0x00B6, 0x00B7,
+	0x017E, 0x00B9, 0x00BA, 0x00BB, 0x0152, 0x0153, 0x0178, 0x00BF,
+	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+	0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+	0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+	0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+	0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF
+};
+const size_t of_iso_8859_15_table_offset =
+    256 - (sizeof(of_iso_8859_15_table) / sizeof(*of_iso_8859_15_table));
+
+static const unsigned char page0[] = {
+	0x00, 0xA5, 0x00, 0xA7, 0x00, 0xA9, 0xAA, 0xAB,
+	0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3,
+	0x00, 0xB5, 0xB6, 0xB7, 0x00, 0xB9, 0xBA, 0xBB,
+	0x00, 0x00, 0x00
+};
+static const uint8_t page0Start = 0xA4;
+
+static const unsigned char page1[] = {
+	0xBC, 0xBD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA6, 0xA8,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBE, 0x00,
+	0x00, 0x00, 0x00, 0xB4, 0xB8
+};
+static const uint8_t page1Start = 0x52;
+
+static const unsigned char page20[] = {
+	0xA4
+};
+static const uint8_t page20Start = 0xAC;
+
+bool
+of_unicode_to_iso_8859_15(const of_unichar_t *input, unsigned char *output,
+    size_t length, bool lossy)
+{
+	for (size_t i = 0; i < length; i++) {
+		of_unichar_t c = input[i];
+
+		if OF_UNLIKELY (c > 0x7F) {
+			uint8_t idx;
+
+			if OF_UNLIKELY (c > 0xFFFF) {
+				if (lossy) {
+					output[i] = '?';
+					continue;
+				} else
+					return false;
+			}
+
+			switch (c >> 8) {
+			CASE_MISSING_IS_KEEP(0)
+			CASE_MISSING_IS_ERROR(1)
+			CASE_MISSING_IS_ERROR(20)
+			default:
+				if (lossy) {
+					output[i] = '?';
+					continue;
+				} else
+					return false;
+			}
+		} else
+			output[i] = (unsigned char)c;
+	}
+
+	return true;
+}

ADDED   src/encodings/iso-8859-2.m
Index: src/encodings/iso-8859-2.m
==================================================================
--- src/encodings/iso-8859-2.m
+++ src/encodings/iso-8859-2.m
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
+ *               2018, 2019, 2020
+ *   Jonathan Schleifer <js@nil.im>
+ *
+ * All rights reserved.
+ *
+ * This file is part of ObjFW. It may be distributed under the terms of the
+ * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
+ * the packaging of this file.
+ *
+ * Alternatively, it may be distributed under the terms of the GNU General
+ * Public License, either version 2 or 3, which can be found in the file
+ * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
+ * file.
+ */
+
+#include "config.h"
+
+#import "OFString.h"
+
+#import "common.h"
+
+const of_char16_t of_iso_8859_2_table[] = {
+	0x00A0, 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7,
+	0x00A8, 0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B,
+	0x00B0, 0x0105, 0x02DB, 0x0142, 0x00B4, 0x013E, 0x015B, 0x02C7,
+	0x00B8, 0x0161, 0x015F, 0x0165, 0x017A, 0x02DD, 0x017E, 0x017C,
+	0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7,
+	0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E,
+	0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7,
+	0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF,
+	0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
+	0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F,
+	0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7,
+	0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9
+};
+const size_t of_iso_8859_2_table_offset =
+    256 - (sizeof(of_iso_8859_2_table) / sizeof(*of_iso_8859_2_table));
+
+static const unsigned char page0[] = {
+	0xA0, 0x00, 0x00, 0x00, 0xA4, 0x00, 0x00, 0xA7,
+	0xA8, 0x00, 0x00, 0x00, 0x00, 0xAD, 0x00, 0x00,
+	0xB0, 0x00, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00,
+	0xB8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xC1, 0xC2, 0x00, 0xC4, 0x00, 0x00, 0xC7,
+	0x00, 0xC9, 0x00, 0xCB, 0x00, 0xCD, 0xCE, 0x00,
+	0x00, 0x00, 0x00, 0xD3, 0xD4, 0x00, 0xD6, 0xD7,
+	0x00, 0x00, 0xDA, 0x00, 0xDC, 0xDD, 0x00, 0xDF,
+	0x00, 0xE1, 0xE2, 0x00, 0xE4, 0x00, 0x00, 0xE7,
+	0x00, 0xE9, 0x00, 0xEB, 0x00, 0xED, 0xEE, 0x00,
+	0x00, 0x00, 0x00, 0xF3, 0xF4, 0x00, 0xF6, 0xF7,
+	0x00, 0x00, 0xFA, 0x00, 0xFC, 0xFD, 0x00, 0x00
+};
+static const uint8_t page0Start = 0xA0;
+
+static const unsigned char page1[] = {
+	0xC3, 0xE3, 0xA1, 0xB1, 0xC6, 0xE6, 0x00, 0x00,
+	0x00, 0x00, 0xC8, 0xE8, 0xCF, 0xEF, 0xD0, 0xF0,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCA, 0xEA,
+	0xCC, 0xEC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC5,
+	0xE5, 0x00, 0x00, 0xA5, 0xB5, 0x00, 0x00, 0xA3,
+	0xB3, 0xD1, 0xF1, 0x00, 0x00, 0xD2, 0xF2, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD5, 0xF5,
+	0x00, 0x00, 0xC0, 0xE0, 0x00, 0x00, 0xD8, 0xF8,
+	0xA6, 0xB6, 0x00, 0x00, 0xAA, 0xBA, 0xA9, 0xB9,
+	0xDE, 0xFE, 0xAB, 0xBB, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xD9, 0xF9, 0xDB, 0xFB,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAC,
+	0xBC, 0xAF, 0xBF, 0xAE, 0xBE
+};
+static const uint8_t page1Start = 0x02;
+
+static const unsigned char page2[] = {
+	0xB7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xA2, 0xFF, 0x00, 0xB2, 0x00, 0xBD
+};
+static const uint8_t page2Start = 0xC7;
+
+bool
+of_unicode_to_iso_8859_2(const of_unichar_t *input, unsigned char *output,
+    size_t length, bool lossy)
+{
+	for (size_t i = 0; i < length; i++) {
+		of_unichar_t c = input[i];
+
+		if OF_UNLIKELY (c > 0x7F) {
+			uint8_t idx;
+
+			if OF_UNLIKELY (c > 0xFFFF) {
+				if (lossy) {
+					output[i] = '?';
+					continue;
+				} else
+					return false;
+			}
+
+			switch (c >> 8) {
+			CASE_MISSING_IS_KEEP(0)
+			CASE_MISSING_IS_ERROR(1)
+			CASE_MISSING_IS_ERROR(2)
+			default:
+				if (lossy) {
+					output[i] = '?';
+					continue;
+				} else
+					return false;
+			}
+		} else
+			output[i] = (unsigned char)c;
+	}
+
+	return true;
+}

ADDED   src/encodings/iso-8859-3.m
Index: src/encodings/iso-8859-3.m
==================================================================
--- src/encodings/iso-8859-3.m
+++ src/encodings/iso-8859-3.m
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
+ *               2018, 2019, 2020
+ *   Jonathan Schleifer <js@nil.im>
+ *
+ * All rights reserved.
+ *
+ * This file is part of ObjFW. It may be distributed under the terms of the
+ * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
+ * the packaging of this file.
+ *
+ * Alternatively, it may be distributed under the terms of the GNU General
+ * Public License, either version 2 or 3, which can be found in the file
+ * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
+ * file.
+ */
+
+#include "config.h"
+
+#import "OFString.h"
+
+#import "common.h"
+
+const of_char16_t of_iso_8859_3_table[] = {
+	0x00A0, 0x0126, 0x02D8, 0x00A3, 0x00A4, 0xFFFF, 0x0124, 0x00A7,
+	0x00A8, 0x0130, 0x015E, 0x011E, 0x0134, 0x00AD, 0xFFFF, 0x017B,
+	0x00B0, 0x0127, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x0125, 0x00B7,
+	0x00B8, 0x0131, 0x015F, 0x011F, 0x0135, 0x00BD, 0xFFFF, 0x017C,
+	0x00C0, 0x00C1, 0x00C2, 0xFFFF, 0x00C4, 0x010A, 0x0108, 0x00C7,
+	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+	0xFFFF, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x0120, 0x00D6, 0x00D7,
+	0x011C, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x016C, 0x015C, 0x00DF,
+	0x00E0, 0x00E1, 0x00E2, 0xFFFF, 0x00E4, 0x010B, 0x0109, 0x00E7,
+	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+	0xFFFF, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x0121, 0x00F6, 0x00F7,
+	0x011D, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x016D, 0x015D, 0x02D9
+};
+const size_t of_iso_8859_3_table_offset =
+    256 - (sizeof(of_iso_8859_3_table) / sizeof(*of_iso_8859_3_table));
+
+static const unsigned char page0[] = {
+	0xA0, 0x00, 0x00, 0xA3, 0xA4, 0x00, 0x00, 0xA7,
+	0xA8, 0x00, 0x00, 0x00, 0x00, 0xAD, 0x00, 0x00,
+	0xB0, 0x00, 0xB2, 0xB3, 0xB4, 0xB5, 0x00, 0xB7,
+	0xB8, 0x00, 0x00, 0x00, 0x00, 0xBD, 0x00, 0x00,
+	0xC0, 0xC1, 0xC2, 0x00, 0xC4, 0x00, 0x00, 0xC7,
+	0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF,
+	0x00, 0xD1, 0xD2, 0xD3, 0xD4, 0x00, 0xD6, 0xD7,
+	0x00, 0xD9, 0xDA, 0xDB, 0xDC, 0x00, 0x00, 0xDF,
+	0xE0, 0xE1, 0xE2, 0x00, 0xE4, 0x00, 0x00, 0xE7,
+	0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
+	0x00, 0xF1, 0xF2, 0xF3, 0xF4, 0x00, 0xF6, 0xF7,
+	0x00, 0xF9, 0xFA, 0xFB, 0xFC, 0x00, 0x00, 0x00
+};
+static const uint8_t page0Start = 0xA0;
+
+static const unsigned char page1[] = {
+	0xC6, 0xE6, 0xC5, 0xE5, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xD8, 0xF8, 0xAB, 0xBB,
+	0xD5, 0xF5, 0x00, 0x00, 0xA6, 0xB6, 0xA1, 0xB1,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xA9, 0xB9, 0x00, 0x00, 0xAC, 0xBC, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xDE, 0xFE, 0xAA, 0xBA,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xDD, 0xFD, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xAF, 0xBF
+};
+static const uint8_t page1Start = 0x08;
+
+static const unsigned char page2[] = {
+	0xA2, 0xFF
+};
+static const uint8_t page2Start = 0xD8;
+
+bool
+of_unicode_to_iso_8859_3(const of_unichar_t *input, unsigned char *output,
+    size_t length, bool lossy)
+{
+	for (size_t i = 0; i < length; i++) {
+		of_unichar_t c = input[i];
+
+		if OF_UNLIKELY (c > 0x7F) {
+			uint8_t idx;
+
+			if OF_UNLIKELY (c > 0xFFFF) {
+				if (lossy) {
+					output[i] = '?';
+					continue;
+				} else
+					return false;
+			}
+
+			switch (c >> 8) {
+			CASE_MISSING_IS_KEEP(0)
+			CASE_MISSING_IS_ERROR(1)
+			CASE_MISSING_IS_ERROR(2)
+			default:
+				if (lossy) {
+					output[i] = '?';
+					continue;
+				} else
+					return false;
+			}
+		} else
+			output[i] = (unsigned char)c;
+	}
+
+	return true;
+}

DELETED src/encodings/iso_8859-15.m
Index: src/encodings/iso_8859-15.m
==================================================================
--- src/encodings/iso_8859-15.m
+++ src/encodings/iso_8859-15.m
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
- *               2018, 2019, 2020
- *   Jonathan Schleifer <js@nil.im>
- *
- * All rights reserved.
- *
- * This file is part of ObjFW. It may be distributed under the terms of the
- * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
- * the packaging of this file.
- *
- * Alternatively, it may be distributed under the terms of the GNU General
- * Public License, either version 2 or 3, which can be found in the file
- * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
- * file.
- */
-
-#include "config.h"
-
-#import "OFString.h"
-
-#import "common.h"
-
-const of_char16_t of_iso_8859_15_table[] = {
-	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AC, 0x00A5, 0x0160, 0x00A7,
-	0x0161, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x017D, 0x00B5, 0x00B6, 0x00B7,
-	0x017E, 0x00B9, 0x00BA, 0x00BB, 0x0152, 0x0153, 0x0178, 0x00BF,
-	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
-	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
-	0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
-	0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
-	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
-	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
-	0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
-	0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF
-};
-const size_t of_iso_8859_15_table_offset =
-    256 - (sizeof(of_iso_8859_15_table) / sizeof(*of_iso_8859_15_table));
-
-static const unsigned char page0[] = {
-	0x00, 0xA5, 0x00, 0xA7, 0x00, 0xA9, 0xAA, 0xAB,
-	0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3,
-	0x00, 0xB5, 0xB6, 0xB7, 0x00, 0xB9, 0xBA, 0xBB,
-	0x00, 0x00, 0x00
-};
-static const uint8_t page0Start = 0xA4;
-
-static const unsigned char page1[] = {
-	0xBC, 0xBD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA6, 0xA8,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBE, 0x00,
-	0x00, 0x00, 0x00, 0xB4, 0xB8
-};
-static const uint8_t page1Start = 0x52;
-
-static const unsigned char page20[] = {
-	0xA4
-};
-static const uint8_t page20Start = 0xAC;
-
-bool
-of_unicode_to_iso_8859_15(const of_unichar_t *input, unsigned char *output,
-    size_t length, bool lossy)
-{
-	for (size_t i = 0; i < length; i++) {
-		of_unichar_t c = input[i];
-
-		if OF_UNLIKELY (c > 0x7F) {
-			uint8_t idx;
-
-			if OF_UNLIKELY (c > 0xFFFF) {
-				if (lossy) {
-					output[i] = '?';
-					continue;
-				} else
-					return false;
-			}
-
-			switch (c >> 8) {
-			CASE_MISSING_IS_KEEP(0)
-			CASE_MISSING_IS_ERROR(1)
-			CASE_MISSING_IS_ERROR(20)
-			default:
-				if (lossy) {
-					output[i] = '?';
-					continue;
-				} else
-					return false;
-			}
-		} else
-			output[i] = (unsigned char)c;
-	}
-
-	return true;
-}

DELETED src/encodings/iso_8859-2.m
Index: src/encodings/iso_8859-2.m
==================================================================
--- src/encodings/iso_8859-2.m
+++ src/encodings/iso_8859-2.m
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
- *               2018, 2019, 2020
- *   Jonathan Schleifer <js@nil.im>
- *
- * All rights reserved.
- *
- * This file is part of ObjFW. It may be distributed under the terms of the
- * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
- * the packaging of this file.
- *
- * Alternatively, it may be distributed under the terms of the GNU General
- * Public License, either version 2 or 3, which can be found in the file
- * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
- * file.
- */
-
-#include "config.h"
-
-#import "OFString.h"
-
-#import "common.h"
-
-const of_char16_t of_iso_8859_2_table[] = {
-	0x00A0, 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7,
-	0x00A8, 0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B,
-	0x00B0, 0x0105, 0x02DB, 0x0142, 0x00B4, 0x013E, 0x015B, 0x02C7,
-	0x00B8, 0x0161, 0x015F, 0x0165, 0x017A, 0x02DD, 0x017E, 0x017C,
-	0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7,
-	0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E,
-	0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7,
-	0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF,
-	0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
-	0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F,
-	0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7,
-	0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9
-};
-const size_t of_iso_8859_2_table_offset =
-    256 - (sizeof(of_iso_8859_2_table) / sizeof(*of_iso_8859_2_table));
-
-static const unsigned char page0[] = {
-	0xA0, 0x00, 0x00, 0x00, 0xA4, 0x00, 0x00, 0xA7,
-	0xA8, 0x00, 0x00, 0x00, 0x00, 0xAD, 0x00, 0x00,
-	0xB0, 0x00, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00,
-	0xB8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0xC1, 0xC2, 0x00, 0xC4, 0x00, 0x00, 0xC7,
-	0x00, 0xC9, 0x00, 0xCB, 0x00, 0xCD, 0xCE, 0x00,
-	0x00, 0x00, 0x00, 0xD3, 0xD4, 0x00, 0xD6, 0xD7,
-	0x00, 0x00, 0xDA, 0x00, 0xDC, 0xDD, 0x00, 0xDF,
-	0x00, 0xE1, 0xE2, 0x00, 0xE4, 0x00, 0x00, 0xE7,
-	0x00, 0xE9, 0x00, 0xEB, 0x00, 0xED, 0xEE, 0x00,
-	0x00, 0x00, 0x00, 0xF3, 0xF4, 0x00, 0xF6, 0xF7,
-	0x00, 0x00, 0xFA, 0x00, 0xFC, 0xFD, 0x00, 0x00
-};
-static const uint8_t page0Start = 0xA0;
-
-static const unsigned char page1[] = {
-	0xC3, 0xE3, 0xA1, 0xB1, 0xC6, 0xE6, 0x00, 0x00,
-	0x00, 0x00, 0xC8, 0xE8, 0xCF, 0xEF, 0xD0, 0xF0,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCA, 0xEA,
-	0xCC, 0xEC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC5,
-	0xE5, 0x00, 0x00, 0xA5, 0xB5, 0x00, 0x00, 0xA3,
-	0xB3, 0xD1, 0xF1, 0x00, 0x00, 0xD2, 0xF2, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD5, 0xF5,
-	0x00, 0x00, 0xC0, 0xE0, 0x00, 0x00, 0xD8, 0xF8,
-	0xA6, 0xB6, 0x00, 0x00, 0xAA, 0xBA, 0xA9, 0xB9,
-	0xDE, 0xFE, 0xAB, 0xBB, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xD9, 0xF9, 0xDB, 0xFB,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAC,
-	0xBC, 0xAF, 0xBF, 0xAE, 0xBE
-};
-static const uint8_t page1Start = 0x02;
-
-static const unsigned char page2[] = {
-	0xB7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0xA2, 0xFF, 0x00, 0xB2, 0x00, 0xBD
-};
-static const uint8_t page2Start = 0xC7;
-
-bool
-of_unicode_to_iso_8859_2(const of_unichar_t *input, unsigned char *output,
-    size_t length, bool lossy)
-{
-	for (size_t i = 0; i < length; i++) {
-		of_unichar_t c = input[i];
-
-		if OF_UNLIKELY (c > 0x7F) {
-			uint8_t idx;
-
-			if OF_UNLIKELY (c > 0xFFFF) {
-				if (lossy) {
-					output[i] = '?';
-					continue;
-				} else
-					return false;
-			}
-
-			switch (c >> 8) {
-			CASE_MISSING_IS_KEEP(0)
-			CASE_MISSING_IS_ERROR(1)
-			CASE_MISSING_IS_ERROR(2)
-			default:
-				if (lossy) {
-					output[i] = '?';
-					continue;
-				} else
-					return false;
-			}
-		} else
-			output[i] = (unsigned char)c;
-	}
-
-	return true;
-}

DELETED src/encodings/iso_8859-3.m
Index: src/encodings/iso_8859-3.m
==================================================================
--- src/encodings/iso_8859-3.m
+++ src/encodings/iso_8859-3.m
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
- *               2018, 2019, 2020
- *   Jonathan Schleifer <js@nil.im>
- *
- * All rights reserved.
- *
- * This file is part of ObjFW. It may be distributed under the terms of the
- * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
- * the packaging of this file.
- *
- * Alternatively, it may be distributed under the terms of the GNU General
- * Public License, either version 2 or 3, which can be found in the file
- * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
- * file.
- */
-
-#include "config.h"
-
-#import "OFString.h"
-
-#import "common.h"
-
-const of_char16_t of_iso_8859_3_table[] = {
-	0x00A0, 0x0126, 0x02D8, 0x00A3, 0x00A4, 0xFFFF, 0x0124, 0x00A7,
-	0x00A8, 0x0130, 0x015E, 0x011E, 0x0134, 0x00AD, 0xFFFF, 0x017B,
-	0x00B0, 0x0127, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x0125, 0x00B7,
-	0x00B8, 0x0131, 0x015F, 0x011F, 0x0135, 0x00BD, 0xFFFF, 0x017C,
-	0x00C0, 0x00C1, 0x00C2, 0xFFFF, 0x00C4, 0x010A, 0x0108, 0x00C7,
-	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
-	0xFFFF, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x0120, 0x00D6, 0x00D7,
-	0x011C, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x016C, 0x015C, 0x00DF,
-	0x00E0, 0x00E1, 0x00E2, 0xFFFF, 0x00E4, 0x010B, 0x0109, 0x00E7,
-	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
-	0xFFFF, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x0121, 0x00F6, 0x00F7,
-	0x011D, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x016D, 0x015D, 0x02D9
-};
-const size_t of_iso_8859_3_table_offset =
-    256 - (sizeof(of_iso_8859_3_table) / sizeof(*of_iso_8859_3_table));
-
-static const unsigned char page0[] = {
-	0xA0, 0x00, 0x00, 0xA3, 0xA4, 0x00, 0x00, 0xA7,
-	0xA8, 0x00, 0x00, 0x00, 0x00, 0xAD, 0x00, 0x00,
-	0xB0, 0x00, 0xB2, 0xB3, 0xB4, 0xB5, 0x00, 0xB7,
-	0xB8, 0x00, 0x00, 0x00, 0x00, 0xBD, 0x00, 0x00,
-	0xC0, 0xC1, 0xC2, 0x00, 0xC4, 0x00, 0x00, 0xC7,
-	0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF,
-	0x00, 0xD1, 0xD2, 0xD3, 0xD4, 0x00, 0xD6, 0xD7,
-	0x00, 0xD9, 0xDA, 0xDB, 0xDC, 0x00, 0x00, 0xDF,
-	0xE0, 0xE1, 0xE2, 0x00, 0xE4, 0x00, 0x00, 0xE7,
-	0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
-	0x00, 0xF1, 0xF2, 0xF3, 0xF4, 0x00, 0xF6, 0xF7,
-	0x00, 0xF9, 0xFA, 0xFB, 0xFC, 0x00, 0x00, 0x00
-};
-static const uint8_t page0Start = 0xA0;
-
-static const unsigned char page1[] = {
-	0xC6, 0xE6, 0xC5, 0xE5, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xD8, 0xF8, 0xAB, 0xBB,
-	0xD5, 0xF5, 0x00, 0x00, 0xA6, 0xB6, 0xA1, 0xB1,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xA9, 0xB9, 0x00, 0x00, 0xAC, 0xBC, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xDE, 0xFE, 0xAA, 0xBA,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xDD, 0xFD, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0xAF, 0xBF
-};
-static const uint8_t page1Start = 0x08;
-
-static const unsigned char page2[] = {
-	0xA2, 0xFF
-};
-static const uint8_t page2Start = 0xD8;
-
-bool
-of_unicode_to_iso_8859_3(const of_unichar_t *input, unsigned char *output,
-    size_t length, bool lossy)
-{
-	for (size_t i = 0; i < length; i++) {
-		of_unichar_t c = input[i];
-
-		if OF_UNLIKELY (c > 0x7F) {
-			uint8_t idx;
-
-			if OF_UNLIKELY (c > 0xFFFF) {
-				if (lossy) {
-					output[i] = '?';
-					continue;
-				} else
-					return false;
-			}
-
-			switch (c >> 8) {
-			CASE_MISSING_IS_KEEP(0)
-			CASE_MISSING_IS_ERROR(1)
-			CASE_MISSING_IS_ERROR(2)
-			default:
-				if (lossy) {
-					output[i] = '?';
-					continue;
-				} else
-					return false;
-			}
-		} else
-			output[i] = (unsigned char)c;
-	}
-
-	return true;
-}

ADDED   src/encodings/mac-roman.m
Index: src/encodings/mac-roman.m
==================================================================
--- src/encodings/mac-roman.m
+++ src/encodings/mac-roman.m
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
+ *               2018, 2019, 2020
+ *   Jonathan Schleifer <js@nil.im>
+ *
+ * All rights reserved.
+ *
+ * This file is part of ObjFW. It may be distributed under the terms of the
+ * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
+ * the packaging of this file.
+ *
+ * Alternatively, it may be distributed under the terms of the GNU General
+ * Public License, either version 2 or 3, which can be found in the file
+ * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
+ * file.
+ */
+
+#include "config.h"
+
+#import "OFString.h"
+
+#import "common.h"
+
+const of_char16_t of_mac_roman_table[] = {
+	0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1,
+	0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8,
+	0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3,
+	0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC,
+	0x2020, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF,
+	0x00AE, 0x00A9, 0x2122, 0x00B4, 0x00A8, 0x2260, 0x00C6, 0x00D8,
+	0x221E, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x00B5, 0x2202, 0x2211,
+	0x220F, 0x03C0, 0x222B, 0x00AA, 0x00BA, 0x03A9, 0x00E6, 0x00F8,
+	0x00BF, 0x00A1, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB,
+	0x00BB, 0x2026, 0x00A0, 0x00C0, 0x00C3, 0x00D5, 0x0152, 0x0153,
+	0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA,
+	0x00FF, 0x0178, 0x2044, 0x20AC, 0x2039, 0x203A, 0xFB01, 0xFB02,
+	0x2021, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x00CA, 0x00C1,
+	0x00CB, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4,
+	0xF8FF, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0x0131, 0x02C6, 0x02DC,
+	0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7
+};
+const size_t of_mac_roman_table_offset =
+    256 - (sizeof(of_mac_roman_table) / sizeof(*of_mac_roman_table));
+
+static const unsigned char page0[] = {
+	0xCA, 0xC1, 0xA2, 0xA3, 0x00, 0xB4, 0x00, 0xA4,
+	0xAC, 0xA9, 0xBB, 0xC7, 0xC2, 0x00, 0xA8, 0xF8,
+	0xA1, 0xB1, 0x00, 0x00, 0xAB, 0xB5, 0xA6, 0xE1,
+	0xFC, 0x00, 0xBC, 0xC8, 0x00, 0x00, 0x00, 0xC0,
+	0xCB, 0xE7, 0xE5, 0xCC, 0x80, 0x81, 0xAE, 0x82,
+	0xE9, 0x83, 0xE6, 0xE8, 0xED, 0xEA, 0xEB, 0xEC,
+	0x00, 0x84, 0xF1, 0xEE, 0xEF, 0xCD, 0x85, 0x00,
+	0xAF, 0xF4, 0xF2, 0xF3, 0x86, 0x00, 0x00, 0xA7,
+	0x88, 0x87, 0x89, 0x8B, 0x8A, 0x8C, 0xBE, 0x8D,
+	0x8F, 0x8E, 0x90, 0x91, 0x93, 0x92, 0x94, 0x95,
+	0x00, 0x96, 0x98, 0x97, 0x99, 0x9B, 0x9A, 0xD6,
+	0xBF, 0x9D, 0x9C, 0x9E, 0x9F, 0x00, 0x00, 0xD8
+};
+static const uint8_t page0Start = 0xA0;
+
+static const unsigned char page1[] = {
+	0xF5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xCE, 0xCF, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD9,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xC4
+};
+static const uint8_t page1Start = 0x31;
+
+static const unsigned char page2[] = {
+	0xF6, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xF9, 0xFA, 0xFB, 0xFE, 0xF7, 0xFD
+};
+static const uint8_t page2Start = 0xC6;
+
+static const unsigned char page3[] = {
+	0xBD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB9
+};
+static const uint8_t page3Start = 0xA9;
+
+static const unsigned char page20[] = {
+	0xD0, 0xD1, 0x00, 0x00, 0x00, 0xD4, 0xD5, 0xE2,
+	0x00, 0xD2, 0xD3, 0xE3, 0x00, 0xA0, 0xE0, 0xA5,
+	0x00, 0x00, 0x00, 0xC9, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xE4, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDC, 0xDD,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xDA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xDB
+};
+static const uint8_t page20Start = 0x13;
+
+static const unsigned char page21[] = {
+	0xAA
+};
+static const uint8_t page21Start = 0x22;
+
+static const unsigned char page22[] = {
+	0xB6, 0x00, 0x00, 0x00, 0xC6, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xB8, 0x00, 0xB7,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xC3, 0x00, 0x00, 0x00, 0xB0, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xBA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC5, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAD, 0x00,
+	0x00, 0x00, 0xB2, 0xB3
+};
+static const uint8_t page22Start = 0x02;
+
+static const unsigned char page25[] = {
+	0xD7
+};
+static const uint8_t page25Start = 0xCA;
+
+static const unsigned char pageF8[] = {
+	0xF0
+};
+static const uint8_t pageF8Start = 0xFF;
+
+static const unsigned char pageFB[] = {
+	0xDE, 0xDF
+};
+static const uint8_t pageFBStart = 0x01;
+
+bool
+of_unicode_to_mac_roman(const of_unichar_t *input, unsigned char *output,
+    size_t length, bool lossy)
+{
+	for (size_t i = 0; i < length; i++) {
+		of_unichar_t c = input[i];
+
+		if OF_UNLIKELY (c > 0x7F) {
+			uint8_t idx;
+
+			if OF_UNLIKELY (c > 0xFFFF) {
+				if (lossy) {
+					output[i] = '?';
+					continue;
+				} else
+					return false;
+			}
+
+			switch (c >> 8) {
+			CASE_MISSING_IS_ERROR(0)
+			CASE_MISSING_IS_ERROR(1)
+			CASE_MISSING_IS_ERROR(2)
+			CASE_MISSING_IS_ERROR(3)
+			CASE_MISSING_IS_ERROR(20)
+			CASE_MISSING_IS_ERROR(21)
+			CASE_MISSING_IS_ERROR(22)
+			CASE_MISSING_IS_ERROR(25)
+			CASE_MISSING_IS_ERROR(F8)
+			CASE_MISSING_IS_ERROR(FB)
+			default:
+				if (lossy) {
+					output[i] = '?';
+					continue;
+				} else
+					return false;
+			}
+		} else
+			output[i] = (unsigned char)c;
+	}
+
+	return true;
+}

DELETED src/encodings/mac_roman.m
Index: src/encodings/mac_roman.m
==================================================================
--- src/encodings/mac_roman.m
+++ src/encodings/mac_roman.m
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
- *               2018, 2019, 2020
- *   Jonathan Schleifer <js@nil.im>
- *
- * All rights reserved.
- *
- * This file is part of ObjFW. It may be distributed under the terms of the
- * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
- * the packaging of this file.
- *
- * Alternatively, it may be distributed under the terms of the GNU General
- * Public License, either version 2 or 3, which can be found in the file
- * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
- * file.
- */
-
-#include "config.h"
-
-#import "OFString.h"
-
-#import "common.h"
-
-const of_char16_t of_mac_roman_table[] = {
-	0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1,
-	0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8,
-	0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3,
-	0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC,
-	0x2020, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF,
-	0x00AE, 0x00A9, 0x2122, 0x00B4, 0x00A8, 0x2260, 0x00C6, 0x00D8,
-	0x221E, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x00B5, 0x2202, 0x2211,
-	0x220F, 0x03C0, 0x222B, 0x00AA, 0x00BA, 0x03A9, 0x00E6, 0x00F8,
-	0x00BF, 0x00A1, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB,
-	0x00BB, 0x2026, 0x00A0, 0x00C0, 0x00C3, 0x00D5, 0x0152, 0x0153,
-	0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA,
-	0x00FF, 0x0178, 0x2044, 0x20AC, 0x2039, 0x203A, 0xFB01, 0xFB02,
-	0x2021, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x00CA, 0x00C1,
-	0x00CB, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4,
-	0xF8FF, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0x0131, 0x02C6, 0x02DC,
-	0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7
-};
-const size_t of_mac_roman_table_offset =
-    256 - (sizeof(of_mac_roman_table) / sizeof(*of_mac_roman_table));
-
-static const unsigned char page0[] = {
-	0xCA, 0xC1, 0xA2, 0xA3, 0x00, 0xB4, 0x00, 0xA4,
-	0xAC, 0xA9, 0xBB, 0xC7, 0xC2, 0x00, 0xA8, 0xF8,
-	0xA1, 0xB1, 0x00, 0x00, 0xAB, 0xB5, 0xA6, 0xE1,
-	0xFC, 0x00, 0xBC, 0xC8, 0x00, 0x00, 0x00, 0xC0,
-	0xCB, 0xE7, 0xE5, 0xCC, 0x80, 0x81, 0xAE, 0x82,
-	0xE9, 0x83, 0xE6, 0xE8, 0xED, 0xEA, 0xEB, 0xEC,
-	0x00, 0x84, 0xF1, 0xEE, 0xEF, 0xCD, 0x85, 0x00,
-	0xAF, 0xF4, 0xF2, 0xF3, 0x86, 0x00, 0x00, 0xA7,
-	0x88, 0x87, 0x89, 0x8B, 0x8A, 0x8C, 0xBE, 0x8D,
-	0x8F, 0x8E, 0x90, 0x91, 0x93, 0x92, 0x94, 0x95,
-	0x00, 0x96, 0x98, 0x97, 0x99, 0x9B, 0x9A, 0xD6,
-	0xBF, 0x9D, 0x9C, 0x9E, 0x9F, 0x00, 0x00, 0xD8
-};
-static const uint8_t page0Start = 0xA0;
-
-static const unsigned char page1[] = {
-	0xF5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0xCE, 0xCF, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD9,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0xC4
-};
-static const uint8_t page1Start = 0x31;
-
-static const unsigned char page2[] = {
-	0xF6, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0xF9, 0xFA, 0xFB, 0xFE, 0xF7, 0xFD
-};
-static const uint8_t page2Start = 0xC6;
-
-static const unsigned char page3[] = {
-	0xBD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB9
-};
-static const uint8_t page3Start = 0xA9;
-
-static const unsigned char page20[] = {
-	0xD0, 0xD1, 0x00, 0x00, 0x00, 0xD4, 0xD5, 0xE2,
-	0x00, 0xD2, 0xD3, 0xE3, 0x00, 0xA0, 0xE0, 0xA5,
-	0x00, 0x00, 0x00, 0xC9, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0xE4, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDC, 0xDD,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0xDA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0xDB
-};
-static const uint8_t page20Start = 0x13;
-
-static const unsigned char page21[] = {
-	0xAA
-};
-static const uint8_t page21Start = 0x22;
-
-static const unsigned char page22[] = {
-	0xB6, 0x00, 0x00, 0x00, 0xC6, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0xB8, 0x00, 0xB7,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0xC3, 0x00, 0x00, 0x00, 0xB0, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0xBA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC5, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAD, 0x00,
-	0x00, 0x00, 0xB2, 0xB3
-};
-static const uint8_t page22Start = 0x02;
-
-static const unsigned char page25[] = {
-	0xD7
-};
-static const uint8_t page25Start = 0xCA;
-
-static const unsigned char pageF8[] = {
-	0xF0
-};
-static const uint8_t pageF8Start = 0xFF;
-
-static const unsigned char pageFB[] = {
-	0xDE, 0xDF
-};
-static const uint8_t pageFBStart = 0x01;
-
-bool
-of_unicode_to_mac_roman(const of_unichar_t *input, unsigned char *output,
-    size_t length, bool lossy)
-{
-	for (size_t i = 0; i < length; i++) {
-		of_unichar_t c = input[i];
-
-		if OF_UNLIKELY (c > 0x7F) {
-			uint8_t idx;
-
-			if OF_UNLIKELY (c > 0xFFFF) {
-				if (lossy) {
-					output[i] = '?';
-					continue;
-				} else
-					return false;
-			}
-
-			switch (c >> 8) {
-			CASE_MISSING_IS_ERROR(0)
-			CASE_MISSING_IS_ERROR(1)
-			CASE_MISSING_IS_ERROR(2)
-			CASE_MISSING_IS_ERROR(3)
-			CASE_MISSING_IS_ERROR(20)
-			CASE_MISSING_IS_ERROR(21)
-			CASE_MISSING_IS_ERROR(22)
-			CASE_MISSING_IS_ERROR(25)
-			CASE_MISSING_IS_ERROR(F8)
-			CASE_MISSING_IS_ERROR(FB)
-			default:
-				if (lossy) {
-					output[i] = '?';
-					continue;
-				} else
-					return false;
-			}
-		} else
-			output[i] = (unsigned char)c;
-	}
-
-	return true;
-}