summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules6
-rw-r--r--COPYING159
-rw-r--r--Makefile32
l---------include/unicode1
-rw-r--r--licenses/Apache-2.0202
-rw-r--r--licenses/LGPL-2481
-rw-r--r--module/Makefile4
-rw-r--r--module/menu.c4
-rw-r--r--module/module.c2
-rw-r--r--riscos/!Boot/Resources/!Unicode/!Boot,feb5
-rw-r--r--riscos/!Boot/Resources/!Unicode/!Help1
-rw-r--r--riscos/!Boot/Resources/!Unicode/!Run,feb5
-rw-r--r--riscos/!Boot/Resources/!Unicode/!Sprites,ff9bin5780 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/!Sprites11,ff9bin11132 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/!Sprites22,ff9bin7324 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/Acorn/Latin1bin256 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/Apple/CentEurobin256 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/Apple/Cyrillicbin256 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/Apple/Romanbin256 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/Apple/Ukrainianbin256 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/BigFivebin29516 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/C0/40[ISO646]bin64 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/C1/43[IS6429]bin64 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/40[646old]bin188 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/41[646-GB]bin188 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/42[646IRV]bin188 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/43[FinSwe]bin188 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/47[646-SE]bin188 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/48[646-SE]bin188 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/49[JS201K]1
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4A[JS201R]bin188 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4B[646-DE]bin188 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4C[646-PT]bin188 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/54[GB1988]bin188 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/56[Teltxt]bin188 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/59[646-IT]bin188 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/5A[646-ES]bin188 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/60[646-NO]bin188 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/66[646-FR]bin188 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/69[646-HU]bin188 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6B[Arabic]bin188 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6C[IS6937]bin188 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/7A[SerbCr]bin188 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/40[JS6226]bin17672 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/41[GB2312]bin17672 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/42[JIS208]bin17672 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/43[KS1001]bin17672 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/44[JIS212]bin17672 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/47[CNS1]bin17672 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/48[CNS2]bin17672 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/49[CNS3]bin17672 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4A[CNS4]bin17672 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4B[CNS5]bin17672 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4C[CNS6]bin17672 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4D[CNS7]2
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/41[Lat1]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/42[Lat2]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/43[Lat3]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/44[Lat4]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/46[Greek]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/47[Arabic]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/48[Hebrew]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4C[Cyrill]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4D[Lat5]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/50[LatSup]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/52[IS6937]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/54[Thai]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/56[Lat6]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/58[L6Sami]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/59[Lat7]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5C[Welsh]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5D[Sami]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5E[Hebrew]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5F[Lat8]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/62[Lat9]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/66[Lat10]bin192 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/KOI8-Rbin256 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1250bin256 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1251bin256 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1252bin256 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1253bin256 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1254bin256 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1256bin256 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP866bin256 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP874bin256 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP932bin996 -> 0 bytes
-rw-r--r--riscos/!Boot/Resources/!Unicode/Files/Aliases303
-rw-r--r--riscos/ReadMe21
-rw-r--r--src/eightbit.c2
-rw-r--r--test/GNU/table-from.c2
-rw-r--r--test/GNU/table-to.c2
-rw-r--r--test/Makefile4
-rw-r--r--test/iconv.c2
-rw-r--r--test/nullable.c2
-rw-r--r--test/translit.c2
-rw-r--r--unicode/.gitignore2
-rw-r--r--unicode/Makefile99
-rw-r--r--unicode/ReadMe35
m---------unicode/Unicode0
m---------unicode/UnicodeLib0
100 files changed, 975 insertions, 406 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..2e7d0a4
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "unicode/UnicodeLib"]
+ path = unicode/UnicodeLib
+ url = https://gitlab.riscosopen.org/RiscOS/Sources/Lib/UnicodeLib.git
+[submodule "unicode/Unicode"]
+ path = unicode/Unicode
+ url = https://gitlab.riscosopen.org/RiscOS/Sources/SystemRes/Unicode.git
diff --git a/COPYING b/COPYING
index 747cb41..266d65e 100644
--- a/COPYING
+++ b/COPYING
@@ -1,19 +1,140 @@
-Copyright (C) 2004-13 J-M Bell
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
- * The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Files: *
+Copyright: 2004-13 J-M Bell
+License: MIT-like
+
+Files: src/transtab
+Copyright: 2000 Markus Kuhn
+License: transtab
+
+Files: test/GNU/*
+Copyright: 2000-2002, 2004-2005 Free Software Foundation, Inc.
+License: LGPL-2+
+
+Files: unicode/Unicode/*
+Copyright:
+ 1997 Acorn Computers Ltd
+ 1999, 2001 Pace Micro Technology plc
+License: Apache-2.0
+
+Files: unicode/Unicode/c/makealiases
+Copyright: 2008 John-Mark Bell
+License: MIT-like
+
+Files: unicode/Unicode/data/CharNames
+Copyright: 2002 Unicode, Inc
+License: Unicode
+
+Files: unicode/UnicodeLib/*
+Copyright:
+ 1997, 1998 Acorn Computers Ltd
+ 1997-2000 Pace Micro Technology PLC.
+ 1999 Element 14 Ltd
+ 2005, 2009, 2015 Castle Technology Ltd
+License: Apache-2.0
+
+Files: unicode/UnicodeLib/data/*
+Copyright:
+ 1991-2002 Unicode, Inc.
+License: Unicode
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ The complete text of the Apache License Version 2.0 can be found in
+ in the file 'licenses/Apache-2.0'.
+
+License: LGPL-2+
+ The GNU LIBICONV Library is free software; you can redistribute it
+ and/or modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ .
+ The GNU LIBICONV Library is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU LIBICONV Library; see the file COPYING.LIB.
+ If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ The full text of the GNU Library General Public License version 2 can be
+ found in the file 'licenses/LGPL-2'.
+
+License: MIT-like
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ * The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+License: transtab
+ This package contains a table for transliterating ISO 10646 texts into
+ best-effort representations using smaller coded character sets (ASCII,
+ ISO 8859, etc.). It is primarily intended for inclusion into the GNU C
+ library, but might be of use for other applications as well. The table
+ is freely available to anyone.
+
+License: Unicode
+ UNICODE LICENSE V3
+ .
+ COPYRIGHT AND PERMISSION NOTICE
+ .
+ Copyright © 1991-2023 Unicode, Inc.
+ .
+ NOTICE TO USER: Carefully read the following legal agreement. BY
+ DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+ SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+ TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+ DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of data files and any associated documentation (the "Data Files") or
+ software and any associated documentation (the "Software") to deal in the
+ Data Files or Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, and/or sell
+ copies of the Data Files or Software, and to permit persons to whom the
+ Data Files or Software are furnished to do so, provided that either (a)
+ this copyright and permission notice appear with all copies of the Data
+ Files or Software, or (b) this copyright and permission notice appear in
+ associated Documentation.
+ .
+ THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+ KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ THIRD PARTY RIGHTS.
+ .
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+ BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+ OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
+ FILES OR SOFTWARE.
+ .
+ Except as contained in this notice, the name of a copyright holder shall
+ not be used in advertising or otherwise to promote the sale, use or other
+ dealings in these Data Files or Software without prior written
+ authorization of the copyright holder.
diff --git a/Makefile b/Makefile
index b646af1..b8d5db6 100644
--- a/Makefile
+++ b/Makefile
@@ -11,25 +11,23 @@ include $(NSSHARED)/makefiles/Makefile.tools
TESTRUNNER := $(PERL) $(NSTESTTOOLS)/testrunner.pl
-ifneq ($(HOST),riscos)
- export UNICODE_DIR := $(CURDIR)/riscos/!Boot/Resources/!Unicode/
-endif
-
# Toolchain flags
+DISABLED_WARNINGS := -Wno-format -Wno-missing-braces -Wno-sign-compare \
+ -Wno-shift-negative-value -Wno-discarded-qualifiers \
+ -Wno-unused-parameter
WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
- -Wmissing-declarations -Wnested-externs -Werror -pedantic
-CFLAGS := -std=c99 -D_BSD_SOURCE -I$(CURDIR)/include/ \
+ -Wmissing-declarations -Wnested-externs $(DISABLED_WARNINGS) \
+ -Werror -pedantic
+CFLAGS := -std=c99 -D_DEFAULT_SOURCE -I$(CURDIR)/include/ \
-I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS)
-ifeq ($(TARGET),riscos)
- LDFLAGS := $(LDFLAGS) -L$(CURDIR)/unicode/libro -lunicode
-else
- LDFLAGS := $(LDFLAGS) -L$(CURDIR)/unicode/lib -lunicode
-endif
-
include $(NSBUILD)/Makefile.top
+ifneq ($(HOST),arm-unknown-riscos)
+ export UNICODE_DIR := $(BUILDDIR)/unires
+endif
+
# Extra installation rules
I := /include/iconv
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/iconv/iconv.h
@@ -44,12 +42,17 @@ ifeq ($(COMPONENT_TYPE),riscos-module)
.PHONY: riscos-dist
# TODO: Make this sensible. Preferably by making use of the install target.
- riscos-dist: all
+ riscos-dist: all $(BUILDDIR)/unires
$(Q)$(CP) $(CPFLAGS) -r riscos riscos-dist
+ $(Q)$(MKDIR) -p riscos-dist/!Boot/Resources
+ $(Q)$(CP) $(CPFLAGS) -r $(BUILDDIR)/unires riscos-dist/!Boot/Resources/!Unicode
$(Q)$(MKDIR) -p riscos-dist/!System/310/Modules
$(Q)$(CP) $(CPFLAGS) $(BUILDDIR)/iconv,ffa riscos-dist/!System/310/Modules/Iconv,ffa
+ $(Q)$(CP) $(CPFLAGS) COPYING riscos-dist
+ $(Q)$(CP) $(CPFLAGS) -r doc riscos-dist
$(Q)$(RM) $(RMFLAGS) -r riscos-dist/doc/Standards
$(Q)$(CP) $(CPFLAGS) include/iconv/iconv.h riscos-dist/stubs/
+ $(Q)$(CP) $(CPFLAGS) -r licenses riscos-dist
$(Q)(cd riscos-dist ; $(GCCSDK_INSTALL_CROSSBIN)/zip -9r, ../iconv.zip *)
$(Q)$(MV) $(MVFLAGS) riscos-dist/!Boot/Resources riscos-dist
$(Q)$(RM) $(RMFLAGS) -r riscos-dist/!Boot
@@ -57,7 +60,8 @@ ifeq ($(COMPONENT_TYPE),riscos-module)
$(Q)$(RM) $(RMFLAGS) -r riscos-dist/doc riscos-dist/stubs
$(Q)$(RM) $(RMFLAGS) riscos-dist/ReadMe
$(Q)$(CP) $(CPFLAGS) -r riscpkg/RiscPkg riscos-dist/
- $(Q)$(CP) $(CPFLAGS) COPYING riscos-dist/RiscPkg/Copyright
+ $(Q)$(MV) $(MVFLAGS) riscos-dist/COPYING riscos-dist/RiscPkg/Copyright
+ $(Q)$(RM) $(RMFLAGS) -r riscos-dist/licenses
$(Q)(cd riscos-dist ; $(GCCSDK_INSTALL_CROSSBIN)/zip -9r, ../iconv-pkg.zip *)
$(Q)$(RM) $(RMFLAGS) -r riscos-dist
diff --git a/include/unicode b/include/unicode
deleted file mode 120000
index 9e7f587..0000000
--- a/include/unicode
+++ /dev/null
@@ -1 +0,0 @@
-../unicode/include/ \ No newline at end of file
diff --git a/licenses/Apache-2.0 b/licenses/Apache-2.0
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/licenses/Apache-2.0
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/licenses/LGPL-2 b/licenses/LGPL-2
new file mode 100644
index 0000000..5bc8fb2
--- /dev/null
+++ b/licenses/LGPL-2
@@ -0,0 +1,481 @@
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL. It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it. You can use it for
+your libraries, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library. If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software. To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+ Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs. This
+license, the GNU Library General Public License, applies to certain
+designated libraries. This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+ The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it. Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program. However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+ Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries. We
+concluded that weaker conditions might promote sharing better.
+
+ However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves. This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them. (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.) The hope is that this
+will lead to faster development of free libraries.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+ Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License"). Each licensee is
+addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ c) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ d) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/module/Makefile b/module/Makefile
index 86e68d8..5921e79 100644
--- a/module/Makefile
+++ b/module/Makefile
@@ -4,4 +4,8 @@ endif
DIR_TEST_ITEMS := iconv:module.c;menu.c;wrapper.c
+ifeq ($(filter $(BUILDDIR)/unires,$(TEST_PREREQS)),)
+ TEST_PREREQS := $(TEST_PREREQS) $(BUILDDIR)/unires
+endif
+
include $(NSBUILD)/Makefile.subdir
diff --git a/module/menu.c b/module/menu.c
index 8a63c15..2a332c7 100644
--- a/module/menu.c
+++ b/module/menu.c
@@ -448,7 +448,7 @@ size_t iconv_createmenu(size_t flags, char *buf, size_t len,
const char *selected, char *data, size_t *dlen)
{
size_t reqlen, datalen;
- char *bp = buf, *dp = NULL;
+ char *dp = NULL;
int sel = 0;
struct canon *c;
@@ -491,7 +491,7 @@ size_t iconv_createmenu(size_t flags, char *buf, size_t len,
#endif
dp = data;
- bp = menu_op((const struct menu_desc *) (void *) &enc_menu, buf,
+ (void) menu_op((const struct menu_desc *) (void *) &enc_menu, buf,
NULL, 0, MENU_CREATE, sel, NULL, &dp);
(*dlen) = datalen;
diff --git a/module/module.c b/module/module.c
index 591a721..fc8f383 100644
--- a/module/module.c
+++ b/module/module.c
@@ -485,7 +485,7 @@ const char *get_aliases_path(void)
if (ucpath == NULL)
return NULL;
- strncpy(aliases, ucpath, sizeof(aliases));
+ strncpy(aliases, ucpath, sizeof(aliases) - 1);
alen = strlen(ucpath);
#ifndef __riscos__
if (aliases[alen - 1] != '/') {
diff --git a/riscos/!Boot/Resources/!Unicode/!Boot,feb b/riscos/!Boot/Resources/!Unicode/!Boot,feb
deleted file mode 100644
index 7c0c462..0000000
--- a/riscos/!Boot/Resources/!Unicode/!Boot,feb
+++ /dev/null
@@ -1,5 +0,0 @@
-| Unicode Boot file
-|
-Set Unicode$Dir <Obey$Dir>
-SetMacro Unicode$Path <Unicode$Dir>.,Resources:$.Resources.Unicode.
-IconSprites Unicode:!Sprites
diff --git a/riscos/!Boot/Resources/!Unicode/!Help b/riscos/!Boot/Resources/!Unicode/!Help
deleted file mode 100644
index 8c04881..0000000
--- a/riscos/!Boot/Resources/!Unicode/!Help
+++ /dev/null
@@ -1 +0,0 @@
-This application contains resources for Unicode support in applications.
diff --git a/riscos/!Boot/Resources/!Unicode/!Run,feb b/riscos/!Boot/Resources/!Unicode/!Run,feb
deleted file mode 100644
index bd70e96..0000000
--- a/riscos/!Boot/Resources/!Unicode/!Run,feb
+++ /dev/null
@@ -1,5 +0,0 @@
-| Unicode Run file
-|
-Set Unicode$Dir <Obey$Dir>
-SetMacro Unicode$Path <Unicode$Dir>.,Resources:$.Resources.Unicode.
-IconSprites Unicode:!Sprites
diff --git a/riscos/!Boot/Resources/!Unicode/!Sprites,ff9 b/riscos/!Boot/Resources/!Unicode/!Sprites,ff9
deleted file mode 100644
index 3eb5b44..0000000
--- a/riscos/!Boot/Resources/!Unicode/!Sprites,ff9
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/!Sprites11,ff9 b/riscos/!Boot/Resources/!Unicode/!Sprites11,ff9
deleted file mode 100644
index 48986b4..0000000
--- a/riscos/!Boot/Resources/!Unicode/!Sprites11,ff9
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/!Sprites22,ff9 b/riscos/!Boot/Resources/!Unicode/!Sprites22,ff9
deleted file mode 100644
index 63a6e61..0000000
--- a/riscos/!Boot/Resources/!Unicode/!Sprites22,ff9
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/Acorn/Latin1 b/riscos/!Boot/Resources/!Unicode/Encodings/Acorn/Latin1
deleted file mode 100644
index bdf5d3b..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/Acorn/Latin1
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/Apple/CentEuro b/riscos/!Boot/Resources/!Unicode/Encodings/Apple/CentEuro
deleted file mode 100644
index 5ab69ff..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/Apple/CentEuro
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/Apple/Cyrillic b/riscos/!Boot/Resources/!Unicode/Encodings/Apple/Cyrillic
deleted file mode 100644
index 670fd6c..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/Apple/Cyrillic
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/Apple/Roman b/riscos/!Boot/Resources/!Unicode/Encodings/Apple/Roman
deleted file mode 100644
index 254579e..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/Apple/Roman
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/Apple/Ukrainian b/riscos/!Boot/Resources/!Unicode/Encodings/Apple/Ukrainian
deleted file mode 100644
index a220587..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/Apple/Ukrainian
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/BigFive b/riscos/!Boot/Resources/!Unicode/Encodings/BigFive
deleted file mode 100644
index c659cef..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/BigFive
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/C0/40[ISO646] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/C0/40[ISO646]
deleted file mode 100644
index cd92b54..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/C0/40[ISO646]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/C1/43[IS6429] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/C1/43[IS6429]
deleted file mode 100644
index 74002a1..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/C1/43[IS6429]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/40[646old] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/40[646old]
deleted file mode 100644
index 00e2d10..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/40[646old]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/41[646-GB] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/41[646-GB]
deleted file mode 100644
index c293f93..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/41[646-GB]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/42[646IRV] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/42[646IRV]
deleted file mode 100644
index e0b4bca..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/42[646IRV]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/43[FinSwe] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/43[FinSwe]
deleted file mode 100644
index 7d46469..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/43[FinSwe]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/47[646-SE] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/47[646-SE]
deleted file mode 100644
index a6b091a..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/47[646-SE]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/48[646-SE] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/48[646-SE]
deleted file mode 100644
index 9bd24ab..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/48[646-SE]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/49[JS201K] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/49[JS201K]
deleted file mode 100644
index 20ce8d4..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/49[JS201K]
+++ /dev/null
@@ -1 +0,0 @@
-abcdefghijklmnopqrstuvwxyz{|}~ \ No newline at end of file
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4A[JS201R] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4A[JS201R]
deleted file mode 100644
index 21d2a47..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4A[JS201R]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4B[646-DE] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4B[646-DE]
deleted file mode 100644
index a2e284e..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4B[646-DE]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4C[646-PT] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4C[646-PT]
deleted file mode 100644
index e076e25..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4C[646-PT]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/54[GB1988] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/54[GB1988]
deleted file mode 100644
index 3b43719..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/54[GB1988]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/56[Teltxt] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/56[Teltxt]
deleted file mode 100644
index 73ce49e..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/56[Teltxt]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/59[646-IT] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/59[646-IT]
deleted file mode 100644
index f1ae819..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/59[646-IT]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/5A[646-ES] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/5A[646-ES]
deleted file mode 100644
index 674fc2d..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/5A[646-ES]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/60[646-NO] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/60[646-NO]
deleted file mode 100644
index fc92892..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/60[646-NO]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/66[646-FR] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/66[646-FR]
deleted file mode 100644
index 8dd6046..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/66[646-FR]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/69[646-HU] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/69[646-HU]
deleted file mode 100644
index 65300b2..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/69[646-HU]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6B[Arabic] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6B[Arabic]
deleted file mode 100644
index c476899..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6B[Arabic]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6C[IS6937] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6C[IS6937]
deleted file mode 100644
index 93453f5..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6C[IS6937]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/7A[SerbCr] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/7A[SerbCr]
deleted file mode 100644
index 9740e78..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/7A[SerbCr]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/40[JS6226] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/40[JS6226]
deleted file mode 100644
index a677dfc..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/40[JS6226]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/41[GB2312] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/41[GB2312]
deleted file mode 100644
index 679608a..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/41[GB2312]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/42[JIS208] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/42[JIS208]
deleted file mode 100644
index 532b1f4..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/42[JIS208]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/43[KS1001] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/43[KS1001]
deleted file mode 100644
index 36186c8..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/43[KS1001]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/44[JIS212] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/44[JIS212]
deleted file mode 100644
index f5343a3..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/44[JIS212]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/47[CNS1] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/47[CNS1]
deleted file mode 100644
index da07f45..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/47[CNS1]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/48[CNS2] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/48[CNS2]
deleted file mode 100644
index 44ee24c..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/48[CNS2]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/49[CNS3] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/49[CNS3]
deleted file mode 100644
index a8464e5..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/49[CNS3]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4A[CNS4] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4A[CNS4]
deleted file mode 100644
index a8f3e32..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4A[CNS4]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4B[CNS5] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4B[CNS5]
deleted file mode 100644
index 535b0f4..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4B[CNS5]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4C[CNS6] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4C[CNS6]
deleted file mode 100644
index 7bfb2b1..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4C[CNS6]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4D[CNS7] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4D[CNS7]
deleted file mode 100644
index be14c72..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4D[CNS7]
+++ /dev/null
@@ -1,2 +0,0 @@
-5UVg6a9E:;U=>??@qABEFzGGH/I1III8K:LLGMQMG788;q>?@AfEEF:I=IJKLL%MJMSM6;>#>C]EZFG I9I7IkJJML5{68d';??ARBQDZEeFHAI)J*JJK~6X9 C|ˁeEGdG#Hٕ4K<@gFGH LLmLpLLM4gZ>BkEGcIJJJJGM4A+CzE FmFGjIlIKL-LEM
-F F.HL1CKKL6r7MtvKyB \ No newline at end of file
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/41[Lat1] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/41[Lat1]
deleted file mode 100644
index 97e6b11..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/41[Lat1]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/42[Lat2] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/42[Lat2]
deleted file mode 100644
index b753c40..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/42[Lat2]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/43[Lat3] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/43[Lat3]
deleted file mode 100644
index 88d4778..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/43[Lat3]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/44[Lat4] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/44[Lat4]
deleted file mode 100644
index a40662d..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/44[Lat4]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/46[Greek] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/46[Greek]
deleted file mode 100644
index c423973..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/46[Greek]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/47[Arabic] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/47[Arabic]
deleted file mode 100644
index 4507f46..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/47[Arabic]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/48[Hebrew] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/48[Hebrew]
deleted file mode 100644
index 70f39cc..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/48[Hebrew]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4C[Cyrill] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4C[Cyrill]
deleted file mode 100644
index 8ff0115..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4C[Cyrill]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4D[Lat5] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4D[Lat5]
deleted file mode 100644
index 6381e60..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4D[Lat5]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/50[LatSup] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/50[LatSup]
deleted file mode 100644
index a320c7f..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/50[LatSup]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/52[IS6937] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/52[IS6937]
deleted file mode 100644
index dff6ccb..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/52[IS6937]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/54[Thai] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/54[Thai]
deleted file mode 100644
index d743777..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/54[Thai]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/56[Lat6] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/56[Lat6]
deleted file mode 100644
index 4e3e4f3..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/56[Lat6]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/58[L6Sami] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/58[L6Sami]
deleted file mode 100644
index 4dfd918..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/58[L6Sami]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/59[Lat7] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/59[Lat7]
deleted file mode 100644
index 256a88e..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/59[Lat7]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5C[Welsh] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5C[Welsh]
deleted file mode 100644
index b5e0050..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5C[Welsh]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5D[Sami] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5D[Sami]
deleted file mode 100644
index 15734c0..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5D[Sami]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5E[Hebrew] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5E[Hebrew]
deleted file mode 100644
index a6593b0..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5E[Hebrew]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5F[Lat8] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5F[Lat8]
deleted file mode 100644
index c15713e..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5F[Lat8]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/62[Lat9] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/62[Lat9]
deleted file mode 100644
index 5bf449d..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/62[Lat9]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/66[Lat10] b/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/66[Lat10]
deleted file mode 100644
index e8ba925..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/66[Lat10]
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/KOI8-R b/riscos/!Boot/Resources/!Unicode/Encodings/KOI8-R
deleted file mode 100644
index 8063cd4..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/KOI8-R
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1250 b/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1250
deleted file mode 100644
index 7a0d35c..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1250
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1251 b/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1251
deleted file mode 100644
index 3d6009c..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1251
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1252 b/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1252
deleted file mode 100644
index 6d3bf29..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1252
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1253 b/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1253
deleted file mode 100644
index 50a48be..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1253
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1254 b/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1254
deleted file mode 100644
index 45ecfe9..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1254
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1256 b/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1256
deleted file mode 100644
index 7fc95a9..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1256
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP866 b/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP866
deleted file mode 100644
index cd214d2..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP866
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP874 b/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP874
deleted file mode 100644
index 26a6fc8..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP874
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP932 b/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP932
deleted file mode 100644
index 2c0c111..0000000
--- a/riscos/!Boot/Resources/!Unicode/Encodings/Microsoft/CP932
+++ /dev/null
Binary files differ
diff --git a/riscos/!Boot/Resources/!Unicode/Files/Aliases b/riscos/!Boot/Resources/!Unicode/Files/Aliases
deleted file mode 100644
index 8978ede..0000000
--- a/riscos/!Boot/Resources/!Unicode/Files/Aliases
+++ /dev/null
@@ -1,303 +0,0 @@
-# > Unicode:Files.Aliases
-# Mapping of character set encoding names to their canonical form
-#
-# Lines starting with a '#' are comments, blank lines are ignored.
-#
-# Based on http://www.iana.org/assignments/character-sets and
-# http://www.iana.org/assignments/ianacharset-mib
-#
-# Canonical Form MIBenum Aliases...
-#
-US-ASCII 3 iso-ir-6 ANSI_X3.4-1986 ISO_646.irv:1991 ASCII ISO646-US ANSI_X3.4-1968 us IBM367 cp367 csASCII
-ISO-10646-UTF-1 27 csISO10646UTF1
-ISO_646.basic:1983 28 ref csISO646basic1983
-INVARIANT 29 csINVARIANT
-ISO_646.irv:1983 30 iso-ir-2 irv csISO2IntlRefVersion
-BS_4730 20 iso-ir-4 ISO646-GB gb uk csISO4UnitedKingdom
-NATS-SEFI 31 iso-ir-8-1 csNATSSEFI
-NATS-SEFI-ADD 32 iso-ir-8-2 csNATSSEFIADD
-NATS-DANO 33 iso-ir-9-1 csNATSDANO
-NATS-DANO-ADD 34 iso-ir-9-2 csNATSDANOADD
-SEN_850200_B 35 iso-ir-10 FI ISO646-FI ISO646-SE se csISO10Swedish
-SEN_850200_C 21 iso-ir-11 ISO646-SE2 se2 csISO11SwedishForNames
-KS_C_5601-1987 36 iso-ir-149 KS_C_5601-1989 KSC_5601 korean csKSC56011987
-ISO-2022-KR 37 csISO2022KR
-EUC-KR 38 csEUCKR EUCKR
-ISO-2022-JP 39 csISO2022JP
-ISO-2022-JP-2 40 csISO2022JP2
-ISO-2022-CN 104
-ISO-2022-CN-EXT 105
-JIS_C6220-1969-jp 41 JIS_C6220-1969 iso-ir-13 katakana x0201-7 csISO13JISC6220jp
-JIS_C6220-1969-ro 42 iso-ir-14 jp ISO646-JP csISO14JISC6220ro
-IT 22 iso-ir-15 ISO646-IT csISO15Italian
-PT 43 iso-ir-16 ISO646-PT csISO16Portuguese
-ES 23 iso-ir-17 ISO646-ES csISO17Spanish
-greek7-old 44 iso-ir-18 csISO18Greek7Old
-latin-greek 45 iso-ir-19 csISO19LatinGreek
-DIN_66003 24 iso-ir-21 de ISO646-DE csISO21German
-NF_Z_62-010_(1973) 46 iso-ir-25 ISO646-FR1 csISO25French
-Latin-greek-1 47 iso-ir-27 csISO27LatinGreek1
-ISO_5427 48 iso-ir-37 csISO5427Cyrillic
-JIS_C6226-1978 49 iso-ir-42 csISO42JISC62261978
-BS_viewdata 50 iso-ir-47 csISO47BSViewdata
-INIS 51 iso-ir-49 csISO49INIS
-INIS-8 52 iso-ir-50 csISO50INIS8
-INIS-cyrillic 53 iso-ir-51 csISO51INISCyrillic
-ISO_5427:1981 54 iso-ir-54 ISO5427Cyrillic1981
-ISO_5428:1980 55 iso-ir-55 csISO5428Greek
-GB_1988-80 56 iso-ir-57 cn ISO646-CN csISO57GB1988
-GB_2312-80 57 iso-ir-58 chinese csISO58GB231280
-NS_4551-1 25 iso-ir-60 ISO646-NO no csISO60DanishNorwegian csISO60Norwegian1
-NS_4551-2 58 ISO646-NO2 iso-ir-61 no2 csISO61Norwegian2
-NF_Z_62-010 26 iso-ir-69 ISO646-FR fr csISO69French
-videotex-suppl 59 iso-ir-70 csISO70VideotexSupp1
-PT2 60 iso-ir-84 ISO646-PT2 csISO84Portuguese2
-ES2 61 iso-ir-85 ISO646-ES2 csISO85Spanish2
-MSZ_7795.3 62 iso-ir-86 ISO646-HU hu csISO86Hungarian
-JIS_C6226-1983 63 iso-ir-87 x0208 JIS_X0208-1983 csISO87JISX0208
-greek7 64 iso-ir-88 csISO88Greek7
-ASMO_449 65 ISO_9036 arabic7 iso-ir-89 csISO89ASMO449
-iso-ir-90 66 csISO90
-JIS_C6229-1984-a 67 iso-ir-91 jp-ocr-a csISO91JISC62291984a
-JIS_C6229-1984-b 68 iso-ir-92 ISO646-JP-OCR-B jp-ocr-b csISO92JISC62991984b
-JIS_C6229-1984-b-add 69 iso-ir-93 jp-ocr-b-add csISO93JIS62291984badd
-JIS_C6229-1984-hand 70 iso-ir-94 jp-ocr-hand csISO94JIS62291984hand
-JIS_C6229-1984-hand-add 71 iso-ir-95 jp-ocr-hand-add csISO95JIS62291984handadd
-JIS_C6229-1984-kana 72 iso-ir-96 csISO96JISC62291984kana
-ISO_2033-1983 73 iso-ir-98 e13b csISO2033
-ANSI_X3.110-1983 74 iso-ir-99 CSA_T500-1983 NAPLPS csISO99NAPLPS
-ISO-8859-1 4 iso-ir-100 ISO_8859-1 ISO_8859-1:1987 latin1 l1 IBM819 CP819 csISOLatin1 8859_1 ISO8859-1
-ISO-8859-2 5 iso-ir-101 ISO_8859-2 ISO_8859-2:1987 latin2 l2 csISOLatin2 8859_2 ISO8859-2
-T.61-7bit 75 iso-ir-102 csISO102T617bit
-T.61-8bit 76 T.61 iso-ir-103 csISO103T618bit
-ISO-8859-3 6 iso-ir-109 ISO_8859-3 ISO_8859-3:1988 latin3 l3 csISOLatin3 8859_3 ISO8859-3
-ISO-8859-4 7 iso-ir-110 ISO_8859-4 ISO_8859-4:1988 latin4 l4 csISOLatin4 8859_4 ISO8859-4
-ECMA-cyrillic 77 iso-ir-111 KOI8-E csISO111ECMACyrillic
-CSA_Z243.4-1985-1 78 iso-ir-121 ISO646-CA csa7-1 ca csISO121Canadian1
-CSA_Z243.4-1985-2 79 iso-ir-122 ISO646-CA2 csa7-2 csISO122Canadian2
-CSA_Z243.4-1985-gr 80 iso-ir-123 csISO123CSAZ24341985gr
-ISO-8859-6 9 iso-ir-127 ISO_8859-6 ISO_8859-6:1987 ECMA-114 ASMO-708 arabic csISOLatinArabic
-ISO-8859-6-E 81 csISO88596E ISO_8859-6-E
-ISO-8859-6-I 82 csISO88596I ISO_8859-6-I
-ISO-8859-7 10 iso-ir-126 ISO_8859-7 ISO_8859-7:1987 ELOT_928 ECMA-118 greek greek8 csISOLatinGreek 8859_7 ISO8859-7
-T.101-G2 83 iso-ir-128 csISO128T101G2
-ISO-8859-8 11 iso-ir-138 ISO_8859-8 ISO_8859-8:1988 hebrew csISOLatinHebrew 8859_8 ISO8859-8
-ISO-8859-8-E 84 csISO88598E ISO_8859-8-E
-ISO-8859-8-I 85 csISO88598I ISO_8859-8-I
-CSN_369103 86 iso-ir-139 csISO139CSN369103
-JUS_I.B1.002 87 iso-ir-141 ISO646-YU js yu csISO141JUSIB1002
-ISO_6937-2-add 14 iso-ir-142 csISOTextComm
-IEC_P27-1 88 iso-ir-143 csISO143IECP271
-ISO-8859-5 8 iso-ir-144 ISO_8859-5 ISO_8859-5:1988 cyrillic csISOLatinCyrillic 8859_5 ISO8859-5
-JUS_I.B1.003-serb 89 iso-ir-146 serbian csISO146Serbian
-JUS_I.B1.003-mac 90 macedonian iso-ir-147 csISO147Macedonian
-ISO-8859-9 12 iso-ir-148 ISO_8859-9 ISO_8859-9:1989 latin5 l5 csISOLatin5 8859_9 ISO8859-9
-greek-ccitt 91 iso-ir-150 csISO150 csISO150GreekCCITT
-NC_NC00-10:81 92 cuba iso-ir-151 ISO646-CU csISO151Cuba
-ISO_6937-2-25 93 iso-ir-152 csISO6937Add
-GOST_19768-74 94 ST_SEV_358-88 iso-ir-153 csISO153GOST1976874
-ISO_8859-supp 95 iso-ir-154 latin1-2-5 csISO8859Supp
-ISO_10367-box 96 iso-ir-155 csISO10367Box
-ISO-8859-10 13 iso-ir-157 l6 ISO_8859-10:1992 csISOLatin6 latin6 8859_10 ISO8859-10
-latin-lap 97 lap iso-ir-158 csISO158Lap
-JIS_X0212-1990 98 x0212 iso-ir-159 csISO159JISX02121990
-DS_2089 99 DS2089 ISO646-DK dk csISO646Danish
-us-dk 100 csUSDK
-dk-us 101 csDKUS
-JIS_X0201 15 X0201 csHalfWidthKatakana
-KSC5636 102 ISO646-KR csKSC5636
-ISO-10646-UCS-2 1000 csUnicode UCS-2 UCS2
-ISO-10646-UCS-4 1001 csUCS4 UCS-4 UCS4
-DEC-MCS 2008 dec csDECMCS
-hp-roman8 2004 roman8 r8 csHPRoman8
-macintosh 2027 mac csMacintosh MACROMAN MAC-ROMAN X-MAC-ROMAN
-IBM037 2028 cp037 ebcdic-cp-us ebcdic-cp-ca ebcdic-cp-wt ebcdic-cp-nl csIBM037
-IBM038 2029 EBCDIC-INT cp038 csIBM038
-IBM273 2030 CP273 csIBM273
-IBM274 2031 EBCDIC-BE CP274 csIBM274
-IBM275 2032 EBCDIC-BR cp275 csIBM275
-IBM277 2033 EBCDIC-CP-DK EBCDIC-CP-NO csIBM277
-IBM278 2034 CP278 ebcdic-cp-fi ebcdic-cp-se csIBM278
-IBM280 2035 CP280 ebcdic-cp-it csIBM280
-IBM281 2036 EBCDIC-JP-E cp281 csIBM281
-IBM284 2037 CP284 ebcdic-cp-es csIBM284
-IBM285 2038 CP285 ebcdic-cp-gb csIBM285
-IBM290 2039 cp290 EBCDIC-JP-kana csIBM290
-IBM297 2040 cp297 ebcdic-cp-fr csIBM297
-IBM420 2041 cp420 ebcdic-cp-ar1 csIBM420
-IBM423 2042 cp423 ebcdic-cp-gr csIBM423
-IBM424 2043 cp424 ebcdic-cp-he csIBM424
-IBM437 2011 cp437 437 csPC8CodePage437
-IBM500 2044 CP500 ebcdic-cp-be ebcdic-cp-ch csIBM500
-IBM775 2087 cp775 csPC775Baltic
-IBM850 2009 cp850 850 csPC850Multilingual
-IBM851 2045 cp851 851 csIBM851
-IBM852 2010 cp852 852 csPCp852
-IBM855 2046 cp855 855 csIBM855
-IBM857 2047 cp857 857 csIBM857
-IBM860 2048 cp860 860 csIBM860
-IBM861 2049 cp861 861 cp-is csIBM861
-IBM862 2013 cp862 862 csPC862LatinHebrew
-IBM863 2050 cp863 863 csIBM863
-IBM864 2051 cp864 csIBM864
-IBM865 2052 cp865 865 csIBM865
-IBM866 2086 cp866 866 csIBM866
-IBM868 2053 CP868 cp-ar csIBM868
-IBM869 2054 cp869 869 cp-gr csIBM869
-IBM870 2055 CP870 ebcdic-cp-roece ebcdic-cp-yu csIBM870
-IBM871 2056 CP871 ebcdic-cp-is csIBM871
-IBM880 2057 cp880 EBCDIC-Cyrillic csIBM880
-IBM891 2058 cp891 csIBM891
-IBM903 2059 cp903 csIBM903
-IBM904 2060 cp904 904 csIBBM904
-IBM905 2061 CP905 ebcdic-cp-tr csIBM905
-IBM918 2062 CP918 ebcdic-cp-ar2 csIBM918
-IBM1026 2063 CP1026 csIBM1026
-EBCDIC-AT-DE 2064 csIBMEBCDICATDE
-EBCDIC-AT-DE-A 2065 csEBCDICATDEA
-EBCDIC-CA-FR 2066 csEBCDICCAFR
-EBCDIC-DK-NO 2067 csEBCDICDKNO
-EBCDIC-DK-NO-A 2068 csEBCDICDKNOA
-EBCDIC-FI-SE 2069 csEBCDICFISE
-EBCDIC-FI-SE-A 2070 csEBCDICFISEA
-EBCDIC-FR 2071 csEBCDICFR
-EBCDIC-IT 2072 csEBCDICIT
-EBCDIC-PT 2073 csEBCDICPT
-EBCDIC-ES 2074 csEBCDICES
-EBCDIC-ES-A 2075 csEBCDICESA
-EBCDIC-ES-S 2076 csEBCDICESS
-EBCDIC-UK 2077 csEBCDICUK
-EBCDIC-US 2078 csEBCDICUS
-UNKNOWN-8BIT 2079 csUnknown8BiT
-MNEMONIC 2080 csMnemonic
-MNEM 2081 csMnem
-VISCII 2082 csVISCII
-VIQR 2083 csVIQR
-KOI8-R 2084 csKOI8R
-KOI8-U 2088
-IBM00858 2089 CCSID00858 CP00858 PC-Multilingual-850+euro
-IBM00924 2090 CCSID00924 CP00924 ebcdic-Latin9--euro
-IBM01140 2091 CCSID01140 CP01140 ebcdic-us-37+euro
-IBM01141 2092 CCSID01141 CP01141 ebcdic-de-273+euro
-IBM01142 2093 CCSID01142 CP01142 ebcdic-dk-277+euro ebcdic-no-277+euro
-IBM01143 2094 CCSID01143 CP01143 ebcdic-fi-278+euro ebcdic-se-278+euro
-IBM01144 2095 CCSID01144 CP01144 ebcdic-it-280+euro
-IBM01145 2096 CCSID01145 CP01145 ebcdic-es-284+euro
-IBM01146 2097 CCSID01146 CP01146 ebcdic-gb-285+euro
-IBM01147 2098 CCSID01147 CP01147 ebcdic-fr-297+euro
-IBM01148 2099 CCSID01148 CP01148 ebcdic-international-500+euro
-IBM01149 2100 CCSID01149 CP01149 ebcdic-is-871+euro
-Big5-HKSCS 2101
-IBM1047 2102 IBM-1047
-PTCP154 2103 csPTCP154 PT154 CP154 Cyrillic-Asian
-Amiga-1251 2104 Ami1251 Amiga1251 Ami-1251
-KOI7-switched 2105
-UNICODE-1-1 1010 csUnicode11
-SCSU 1011
-UTF-7 1012
-UTF-16BE 1013
-UTF-16LE 1014
-UTF-16 1015
-CESU-8 1016 csCESU-8
-UTF-32 1017
-UTF-32BE 1018
-UTF-32LE 1019
-BOCU-1 1020 csBOCU-1
-UNICODE-1-1-UTF-7 103 csUnicode11UTF7
-UTF-8 106 UNICODE-1-1-UTF-8 UNICODE-2-0-UTF-8 utf8
-ISO-8859-13 109 8859_13 ISO8859-13
-ISO-8859-14 110 iso-ir-199 ISO_8859-14:1998 ISO_8859-14 latin8 iso-celtic l8 8859_14 ISO8859-14
-ISO-8859-15 111 ISO_8859-15 Latin-9 8859_15 ISO8859-15
-ISO-8859-16 112 iso-ir-226 ISO_8859-16:2001 ISO_8859-16 latin10 l10
-GBK 113 CP936 MS936 windows-936
-GB18030 114
-OSD_EBCDIC_DF04_15 115
-OSD_EBCDIC_DF03_IRV 116
-OSD_EBCDIC_DF04_1 117
-JIS_Encoding 16 csJISEncoding
-Shift_JIS 17 MS_Kanji csShiftJIS X-SJIS Shift-JIS
-EUC-JP 18 csEUCPkdFmtJapanese Extended_UNIX_Code_Packed_Format_for_Japanese EUCJP
-Extended_UNIX_Code_Fixed_Width_for_Japanese 19 csEUCFixWidJapanese
-ISO-10646-UCS-Basic 1002 csUnicodeASCII
-ISO-10646-Unicode-Latin1 1003 csUnicodeLatin1 ISO-10646
-ISO-Unicode-IBM-1261 1005 csUnicodeIBM1261
-ISO-Unicode-IBM-1268 1006 csUnicodeIBM1268
-ISO-Unicode-IBM-1276 1007 csUnicodeIBM1276
-ISO-Unicode-IBM-1264 1008 csUnicodeIBM1264
-ISO-Unicode-IBM-1265 1009 csUnicodeIBM1265
-ISO-8859-1-Windows-3.0-Latin-1 2000 csWindows30Latin1
-ISO-8859-1-Windows-3.1-Latin-1 2001 csWindows31Latin1
-ISO-8859-2-Windows-Latin-2 2002 csWindows31Latin2
-ISO-8859-9-Windows-Latin-5 2003 csWindows31Latin5
-Adobe-Standard-Encoding 2005 csAdobeStandardEncoding
-Ventura-US 2006 csVenturaUS
-Ventura-International 2007 csVenturaInternational
-PC8-Danish-Norwegian 2012 csPC8DanishNorwegian
-PC8-Turkish 2014 csPC8Turkish
-IBM-Symbols 2015 csIBMSymbols
-IBM-Thai 2016 csIBMThai
-HP-Legal 2017 csHPLegal
-HP-Pi-font 2018 csHPPiFont
-HP-Math8 2019 csHPMath8
-Adobe-Symbol-Encoding 2020 csHPPSMath
-HP-DeskTop 2021 csHPDesktop
-Ventura-Math 2022 csVenturaMath
-Microsoft-Publishing 2023 csMicrosoftPublishing
-Windows-31J 2024 csWindows31J
-GB2312 2025 csGB2312 EUC-CN EUCCN CN-GB
-Big5 2026 csBig5 BIG-FIVE BIG-5 CN-BIG5 BIG_FIVE x-x-big5
-windows-1250 2250 CP1250 MS-EE
-windows-1251 2251 CP1251 MS-CYRL
-windows-1252 2252 CP1252 MS-ANSI
-windows-1253 2253 CP1253 MS-GREEK
-windows-1254 2254 CP1254 MS-TURK
-windows-1255 2255
-windows-1256 2256 CP1256 MS-ARAB
-windows-1257 2257 CP1257 WINBALTRIM
-windows-1258 2258
-TIS-620 2259
-HZ-GB-2312 2085
-
-# Additional encodings not defined by IANA
-
-# Arbitrary allocations
-#CP737 3001
-#CP853 3002
-#CP856 3003
-CP874 3004 WINDOWS-874
-#CP922 3005
-#CP1046 3006
-#CP1124 3007
-#CP1125 3008 WINDOWS-1125
-#CP1129 3009
-#CP1133 3010 IBM-CP1133
-#CP1161 3011 IBM-1161 IBM1161 CSIBM1161
-#CP1162 3012 IBM-1162 IBM1162 CSIBM1162
-#CP1163 3013 IBM-1163 IBM1163 CSIBM1163
-#GEORGIAN-ACADEMY 3014
-#GEORGIAN-PS 3015
-#KOI8-RU 3016
-#KOI8-T 3017
-#MACARABIC 3018 X-MAC-ARABIC MAC-ARABIC
-#MACCROATIAN 3019 X-MAC-CROATIAN MAC-CROATIAN
-#MACGREEK 3020 X-MAC-GREEK MAC-GREEK
-#MACHEBREW 3021 X-MAC-HEBREW MAC-HEBREW
-#MACICELAND 3022 X-MAC-ICELAND MAC-ICELAND
-#MACROMANIA 3023 X-MAC-ROMANIA MAC-ROMANIA
-#MACTHAI 3024 X-MAC-THAI MAC-THAI
-#MACTURKISH 3025 X-MAC-TURKISH MAC-TURKISH
-#MULELAO-1 3026
-CP949 3027 WINDOWS-949
-
-# From Unicode Lib
-ISO-IR-182 4000
-ISO-IR-197 4002
-ISO-2022-JP-1 4008
-MACCYRILLIC 4009 X-MAC-CYRILLIC MAC-CYRILLIC
-MACUKRAINE 4010 X-MAC-UKRAINIAN MAC-UKRAINIAN
-MACCENTRALEUROPE 4011 X-MAC-CENTRALEURROMAN MAC-CENTRALEURROMAN
-JOHAB 4012
-ISO-8859-11 4014 iso-ir-166 ISO_8859-11 ISO8859-11 8859_11
-X-CURRENT 4999 X-SYSTEM
-X-ACORN-LATIN1 5001
-X-ACORN-FUZZY 5002
diff --git a/riscos/ReadMe b/riscos/ReadMe
index 907c2c7..f49a1b0 100644
--- a/riscos/ReadMe
+++ b/riscos/ReadMe
@@ -24,22 +24,5 @@ See the ReadMe file in that directory for further information.
Licence
=======
-Iconv is Copyright 2004-13 J-M Bell
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
- * The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Please see the COPYING file for full licensing information. No part of the
+test suite is included in this binary distribution.
diff --git a/src/eightbit.c b/src/eightbit.c
index f201f31..8dfdb75 100644
--- a/src/eightbit.c
+++ b/src/eightbit.c
@@ -321,7 +321,7 @@ const char *get_table_path(const char *table)
if (ucpath == NULL)
return NULL;
- strncpy(path, ucpath, sizeof(path));
+ strncpy(path, ucpath, sizeof(path) - 1);
plen = strlen(ucpath);
#ifndef __riscos__
if (path[plen - 1] != '/') {
diff --git a/test/GNU/table-from.c b/test/GNU/table-from.c
index 56a0dab..92300d6 100644
--- a/test/GNU/table-from.c
+++ b/test/GNU/table-from.c
@@ -126,7 +126,7 @@ int main (int argc, char* argv[])
exit(1);
}
- strncpy(aliases, ucpath, sizeof(aliases));
+ strncpy(aliases, ucpath, sizeof(aliases) - 1);
alen = strlen(ucpath);
#ifndef __riscos__
if (aliases[alen - 1] != '/') {
diff --git a/test/GNU/table-to.c b/test/GNU/table-to.c
index 62c30a8..3246428 100644
--- a/test/GNU/table-to.c
+++ b/test/GNU/table-to.c
@@ -59,7 +59,7 @@ int main (int argc, char* argv[])
exit(1);
}
- strncpy(aliases, ucpath, sizeof(aliases));
+ strncpy(aliases, ucpath, sizeof(aliases) - 1);
alen = strlen(ucpath);
#ifndef __riscos__
if (aliases[alen - 1] != '/') {
diff --git a/test/Makefile b/test/Makefile
index c5d298f..19e2924 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,4 +1,8 @@
# Tests
DIR_TEST_ITEMS := iconv:iconv.c nullable:nullable.c translit:translit.c
+ifeq ($(filter $(BUILDDIR)/unires,$(TEST_PREREQS)),)
+ TEST_PREREQS := $(TEST_PREREQS) $(BUILDDIR)/unires
+endif
+
include $(NSBUILD)/Makefile.subdir
diff --git a/test/iconv.c b/test/iconv.c
index cd0bfa3..f257782 100644
--- a/test/iconv.c
+++ b/test/iconv.c
@@ -28,7 +28,7 @@ int main(int argc, char **argv)
assert(ucpath != NULL);
- strncpy(aliases, ucpath, sizeof(aliases));
+ strncpy(aliases, ucpath, sizeof(aliases) - 1);
alen = strlen(aliases);
#ifndef __riscos__
if (aliases[alen - 1] != '/') {
diff --git a/test/nullable.c b/test/nullable.c
index c9523f5..2052702 100644
--- a/test/nullable.c
+++ b/test/nullable.c
@@ -77,7 +77,7 @@ int main(int argc, char **argv)
assert(ucpath != NULL);
- strncpy(aliases, ucpath, sizeof(aliases));
+ strncpy(aliases, ucpath, sizeof(aliases) - 1);
alen = strlen(aliases);
#ifndef __riscos__
if (aliases[alen - 1] != '/') {
diff --git a/test/translit.c b/test/translit.c
index 240f5e2..d8252d2 100644
--- a/test/translit.c
+++ b/test/translit.c
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
assert(ucpath != NULL);
- strncpy(aliases, ucpath, sizeof(aliases));
+ strncpy(aliases, ucpath, sizeof(aliases) - 1);
alen = strlen(aliases);
#ifndef __riscos__
if (aliases[alen - 1] != '/') {
diff --git a/unicode/.gitignore b/unicode/.gitignore
deleted file mode 100644
index c1845f3..0000000
--- a/unicode/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-include
-lib*
diff --git a/unicode/Makefile b/unicode/Makefile
new file mode 100644
index 0000000..808c4b0
--- /dev/null
+++ b/unicode/Makefile
@@ -0,0 +1,99 @@
+# Ensure BUILDDIR is on the include path
+CFLAGS := $(CFLAGS) -I$(BUILDDIR)/
+
+$(BUILDDIR)/unicode:
+ $(Q)$(MKDIR) $@
+
+# Collect UnicodeLib headers
+UHDRS := $(BUILDDIR)/VersionNum
+define add_uhdr
+
+$$(BUILDDIR)/unicode/$$(notdir $(1)).h: $(1) $$(BUILDDIR)/unicode
+ $$(VQ)$$(ECHO) " COPY: $$<"
+ $$(Q)$$(CP) $$< $$@
+
+UHDRS += $$(BUILDDIR)/unicode/$$(notdir $(1)).h
+
+endef
+
+$(eval $(foreach UHDR,$(wildcard unicode/UnicodeLib/h/*),$(call add_uhdr,$(UHDR))))
+
+# Work out UnicodeLib sources to ignore
+IGNORE_SRCS := debug mkunictype textconv
+ifneq ($(findstring -riscos,$(HOST)),)
+ IGNORE_SRCS := $(IGNORE_SRCS) unix
+else
+ IGNORE_SRCS := $(IGNORE_SRCS) riscos
+endif
+
+# Collect UnicodeLib sources
+define add_usrc
+
+$$(BUILDDIR)/unicode/$$(notdir $(1)).c: $(1) $$(UHDRS)
+ $$(VQ)$$(ECHO) " COPY: $$<"
+ $$(Q)$$(CP) $$< $$@
+
+SOURCES += $$(BUILDDIR)/unicode/$$(notdir $(1)).c
+
+endef
+
+$(eval $(foreach USRC,$(filter-out $(addprefix unicode/UnicodeLib/c/,$(IGNORE_SRCS)),$(wildcard unicode/UnicodeLib/c/*)),$(call add_usrc,$(USRC))))
+
+$(BUILDDIR)/VersionNum: unicode/UnicodeLib/VersionNum $(BUILDDIR)/unicode
+ $(VQ)$(ECHO) " COPY: $<"
+ $(Q)$(CP) $< $@
+
+# Hand-crafted rules to ensure unictype.c gets built
+$(BUILDDIR)/unicode_mkunictype.c: unicode/UnicodeLib/c/mkunictype
+ $(VQ)$(ECHO) " COPY: $<"
+ $(Q)$(CP) $< $@
+
+$(BUILDDIR)/mkunictype: $(BUILDDIR)/unicode_mkunictype.c
+ $(VQ)$(ECHO) "BUILD.CC: $<"
+ $(Q)$(BUILD_CC) -I$(BUILDDIR)/unicode -o $@ $<
+
+$(BUILDDIR)/unicode/unictype.c: unicode/UnicodeLib/data/UnicodeData $(BUILDDIR)/mkunictype $(UHDRS)
+ $(VQ)$(ECHO) "UNICTYPE: $<"
+ $(Q)$(BUILDDIR)/mkunictype <$< >$@
+
+SOURCES := $(SOURCES) $(BUILDDIR)/unicode/unictype.c
+
+###############################################################################
+## Unicode resource ##
+###############################################################################
+
+# Hand-crafted rules for makealiases
+$(BUILDDIR)/unicode_makealiases.c: unicode/Unicode/c/makealiases
+ $(VQ)$(ECHO) " COPY: $<"
+ $(Q)$(CP) $< $@
+
+$(BUILDDIR)/makealiases: $(BUILDDIR)/unicode_makealiases.c
+ $(VQ)$(ECHO) "BUILD.CC: $<"
+ $(Q)$(BUILD_CC) -o $@ $<
+
+# The dependencies *must* be in makealiases command line order
+$(BUILDDIR)/Aliases: $(BUILDDIR)/makealiases unicode/Unicode/data/aliases-top unicode/Unicode/data/character-sets unicode/Unicode/data/aliases-bottom
+ $(VQ)$(ECHO) " MKALIAS: compiling Aliases"
+ $(Q)$^ $@
+
+# This is basically an open-coded version of the upstream Makefile logic
+# TODO: is there a more robust way?
+$(BUILDDIR)/unires: $(BUILDDIR)/Aliases $(wildcard unicode/Unicode/*)
+ $(Q)$(MKDIR) $@.tmp
+ $(Q)$(CP) unicode/Unicode/Resources/UK/!Boot,feb $@.tmp/!Boot,feb
+ $(Q)$(CP) unicode/Unicode/Resources/UK/!Help $@.tmp/!Help
+ $(Q)$(CP) unicode/Unicode/Resources/UK/!Run,feb $@.tmp/!Run,feb
+ $(Q)$(CP) -r unicode/Unicode/Resources/Encodings $@.tmp/Encodings
+ifeq ($(findstring -riscos,$(HOST)),)
+ $(Q)for f in $$(find $@.tmp/Encodings/ -name '*,ffd'); do mv $$f $${f%%,ffd}; done
+endif
+ $(Q)$(MKDIR) $@.tmp/Files
+ $(Q)$(CP) unicode/Unicode/data/CharNames $@.tmp/Files/CharNames
+ $(Q)$(CP) $(BUILDDIR)/Aliases $@.tmp/Files/Aliases
+ $(Q)$(MKDIR) $@.tmp/Themes
+ $(Q)$(CP) unicode/Unicode/Resources/UK/!Sprites,ff9 $@.tmp/Themes/!Sprites,ff9
+ $(Q)$(CP) unicode/Unicode/Resources/UK/!Sprites11,ff9 $@.tmp/Themes/!Sprites11,ff9
+ $(Q)$(CP) unicode/Unicode/Resources/UK/!Sprites22,ff9 $@.tmp/Themes/!Sprites22,ff9
+ $(Q)$(CP) -r unicode/Unicode/Resources/UK/Morris4 $@.tmp/Themes/Morris4
+ $(Q)$(CP) -r unicode/Unicode/Resources/UK/Ursula $@.tmp/Themes/Ursula
+ $(Q)$(MV) $@.tmp $@
diff --git a/unicode/ReadMe b/unicode/ReadMe
index 41e8069..bb8d42b 100644
--- a/unicode/ReadMe
+++ b/unicode/ReadMe
@@ -1,28 +1,13 @@
-Unicode library
----------------
+Unicode components
+------------------
-The contents of this directory must be obtained from RISC OS Open.
+This directory contains the Unicode and UnicodeLib components submoduled
+from RISC OS Open and sufficient Makefile shenanigans to make them build.
-The include directory should contain the exported headers:
+The Unicode resource sources will be used verbatim (as the only compiled
+code is a build tool, always compiled for the build host.
- + autojp.h
- + charsets.h
- + combine.h
- + encoding.h
- + iso10646.h
- + iso3166.h
- + languages.h
- + unictype.h
- + utf8.h
- + utf16.h
-
-The lib directory should contain the library compiled for the host platform:
-
- + libunicode.a (renamed from ucodelib.a)
-
-The libro directory should contain the library compiled for RISC OS:
-
- + libunicode.a (renamed from ucodelib.a)
-
-If wanting to build the RISC OS module, ensure that the library was built with
--mmodule. Otherwise, linking will fail with differing FP implementations.
+The UnicodeLib sources will be copied into a suitable source
+structure within the relevant BUILDDIR (so builds for Unix systems,
+or RISC OS libraries, or RISC OS modules will automagically pick
+up the correct compiler options).
diff --git a/unicode/Unicode b/unicode/Unicode
new file mode 160000
+Subproject 648c68f8e933e0fb3dc181ab14bb62ed924a703
diff --git a/unicode/UnicodeLib b/unicode/UnicodeLib
new file mode 160000
+Subproject 1b8b080fd9d4785dc20e7bc4e474dcd9e104d00