Mercurial > hg > xemacs-beta
changeset 4895:65ad2cd9f2ff
Automated merge with http://hg.debian.org/hg/xemacs/xemacs
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 29 Jan 2010 15:06:36 -0600 |
| parents | 03ab78e48ef6 (diff) eab9498ecc0e (current diff) |
| children | 9a6c3653f58e |
| files | src/ChangeLog |
| diffstat | 61 files changed, 2298 insertions(+), 1082 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jan 18 08:44:49 2010 -0600 +++ b/ChangeLog Fri Jan 29 15:06:36 2010 -0600 @@ -4,6 +4,10 @@ Add description of crash on recent Cygwin 1.7 when using C++, NEWGC and optimization. +2010-01-16 Aidan Kehoe <kehoea@parhasard.net> + + * configure: Regenerate, now we no longer look for rint(). + 2010-01-13 Jerry James <james@xemacs.org> * configure.ac: Update comment about Cygwin and pdump.
--- a/configure Mon Jan 18 08:44:49 2010 -0600 +++ b/configure Fri Jan 29 15:06:36 2010 -0600 @@ -1,14 +1,12 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for XEmacs 21.5. +# Generated by GNU Autoconf 2.64 for XEmacs 21.5. # # Report bugs to <xemacs-beta@xemacs.org>. # -# # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software +# Foundation, Inc. # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -575,8 +573,7 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -test -n "$DJDIR" || exec 7<&0 </dev/null -exec 6>&1 +exec 7<&0 </dev/null 6>&1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -1989,7 +1986,7 @@ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a nonstandard directory <lib dir> LIBS libraries to pass to the linker, e.g. -l<library> - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> CPP C preprocessor YACC The `Yet Another C Compiler' implementation to use. Defaults to @@ -2066,7 +2063,7 @@ if $ac_init_version; then cat <<\_ACEOF XEmacs configure 21.5 -generated by GNU Autoconf 2.65 +generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -2159,7 +2156,7 @@ ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval + return $ac_retval } # ac_fn_c_try_compile @@ -2196,7 +2193,7 @@ ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval + return $ac_retval } # ac_fn_c_try_cpp @@ -2331,7 +2328,7 @@ fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval + return $ac_retval } # ac_fn_c_try_run @@ -2408,7 +2405,7 @@ # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval + return $ac_retval } # ac_fn_c_try_link @@ -2803,7 +2800,7 @@ fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval + return $ac_retval } # ac_fn_c_compute_int cat >config.log <<_ACEOF @@ -2811,7 +2808,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by XEmacs $as_me 21.5, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -3064,7 +3061,7 @@ for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + if test -r "$ac_site_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 @@ -3073,9 +3070,9 @@ done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special files - # actually), so we avoid doing that. DJGPP emulates it as a regular file. - if test /dev/null != "$cache_file" && test -f "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in @@ -6298,30 +6295,32 @@ ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err + rm -f conftest.er1 conftest.err + fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -int -main () -{ +#include <stdio.h> +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: @@ -6383,10 +6382,10 @@ else ac_file='' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 @@ -6394,18 +6393,51 @@ { as_fn_set_status 77 as_fn_error "C compiler cannot create executables See \`config.log' for more details." "$LINENO" 5; }; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +fi +ac_exeext=$ac_cv_exeext + +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +# If not cross compiling, check that we can run a simple program. +if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -ac_exeext=$ac_cv_exeext - -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out ac_clean_files=$ac_clean_files_save +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" @@ -6438,72 +6470,13 @@ as_fn_error "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." "$LINENO" 5; } fi -rm -f conftest conftest$ac_cv_exeext +rm -f conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdio.h> -int -main () -{ -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -ac_clean_files="$ac_clean_files conftest.out" -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -if test "$cross_compiling" != yes; then - { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if { ac_try='./conftest$ac_cv_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } - fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } if test "${ac_cv_objext+set}" = set; then : @@ -7562,8 +7535,8 @@ ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err + rm -f conftest.er1 conftest.err + fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -8110,8 +8083,8 @@ ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err + rm -f conftest.er1 conftest.err + fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -8658,8 +8631,8 @@ ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err + rm -f conftest.er1 conftest.err + fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -21558,7 +21531,7 @@ # values after options handling. ac_log=" This file was extended by XEmacs $as_me 21.5, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -21598,7 +21571,6 @@ -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit - --config print configuration, then exit -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files @@ -21621,11 +21593,10 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ XEmacs config.status 21.5 -configured by $0, generated by GNU Autoconf 2.65, - with options \\"\$ac_cs_config\\" +configured by $0, generated by GNU Autoconf 2.64, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation @@ -21661,8 +21632,6 @@ ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; - --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) @@ -21857,7 +21826,7 @@ t delim :nl h -s/\(.\{148\}\)..*/\1/ +s/\(.\{148\}\).*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -21871,7 +21840,7 @@ t nl :delim h -s/\(.\{148\}\)..*/\1/ +s/\(.\{148\}\).*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p
--- a/etc/ChangeLog Mon Jan 18 08:44:49 2010 -0600 +++ b/etc/ChangeLog Fri Jan 29 15:06:36 2010 -0600 @@ -1,3 +1,16 @@ +2010-01-28 Jerry James <james@xemacs.org> + + * tests/external-widget/Makefile: Add copyright and license + boilerplate text based on Ben's recollection. + * tests/external-widget/test-ew-motif.c: Ditto. + * tests/external-widget/test-ew-xlib.c: Ditto. + * unicode/other/lao.txt: Ditto. + +2010-01-26 Aidan Kehoe <kehoea@parhasard.net> + + * HELLO: Encode the Arabic in arabic-iso8859-6 once more; delete + the old, experimentally-encoded Thai. + 2010-01-04 Jerry James <james@xemacs.org> * Emacs.ad: Change /usr/lib/X11 to /usr/share/X11.
--- a/etc/HELLO Mon Jan 18 08:44:49 2010 -0600 +++ b/etc/HELLO Fri Jan 29 15:06:36 2010 -0600 @@ -5,7 +5,7 @@ --------------------------------------------------------- Amharic ($(3"c!<!N"^(B) $(3!A!,!>(B -Arabic (%Gةّيبرعلا%@) %Gمكيلع%@ %Gمالّسلا%@ +Arabic ([2],GIqjHQYdG[0](B) [2],GecjdY[0](B [2],GeGdqSdG[0](B Croatian (Hrvatski) Bog (Bok), Dobar dan Czech (,Bh(Besky) Dobr,B}(B den Danish (Dansk) Hej, Goddag @@ -30,7 +30,6 @@ Spanish (Espa,Aq(Bol) ,A!(BHola! Swedish (Svenska) Hej, Goddag Tajik ,LAP[^\(B -Thai ($(?@0R0I0R0d070B0(B) $(?J0G8J04H$0C8:0(B, $(?J0G8J04H$2P0(B Tigrigna ($(3"8#r!N"^(B) $(3!Q!,!<"8(B Turkish (T,A|(Brk,Ag(Be) Merhaba
--- a/etc/tests/external-widget/Makefile Mon Jan 18 08:44:49 2010 -0600 +++ b/etc/tests/external-widget/Makefile Fri Jan 29 15:06:36 2010 -0600 @@ -1,3 +1,23 @@ +## Makefile for external widget test code. +## Copyright (C) 1993 Ben Wing. + +## This file is part of XEmacs. + +## XEmacs is free software; you can redistribute it and/or modify it +## under the terms of the GNU General Public License as published by the +## Free Software Foundation; either version 2, or (at your option) any +## later version. + +## XEmacs 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 General Public License +## for more details. + +## You should have received a copy of the GNU General Public License +## along with XEmacs; see the file COPYING. If not, write to +## the Free Software Foundation, Inc., 51 Franklin St - Fifth Floor, +## Boston, MA 02110-1301, USA. + CFLAGS += -Xc -g -DTOOLTALK EMACSHOME = ../../.. EMACSLIBDIR = $(EMACSHOME)/editor/src
--- a/etc/tests/external-widget/test-ew-motif.c Mon Jan 18 08:44:49 2010 -0600 +++ b/etc/tests/external-widget/test-ew-motif.c Fri Jan 29 15:06:36 2010 -0600 @@ -1,3 +1,23 @@ +/* Test external widget code in Motif. + Copyright (C) 1993 Ben Wing. + +This file is part of XEmacs. + +XEmacs is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2, or (at your option) any +later version. + +XEmacs 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 General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with XEmacs; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 51 Franklin St - Fifth Floor, +Boston, MA 02110-1301, USA. */ + #include <Xm/Xm.h> #include <Xm/RowColumn.h> #include <Xm/Scale.h>
--- a/etc/tests/external-widget/test-ew-xlib.c Mon Jan 18 08:44:49 2010 -0600 +++ b/etc/tests/external-widget/test-ew-xlib.c Fri Jan 29 15:06:36 2010 -0600 @@ -1,7 +1,24 @@ -/* - * Copyright 1989 O'Reilly and Associates, Inc. - * See ../Copyright for complete rights and liability information. - */ +/* Test external widget code in Motif. + Copyright (C) 1989 O'Reilly and Associates, Inc. + Copyright (C) 1993 Ben Wing. + +This file is part of XEmacs. + +XEmacs is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2, or (at your option) any +later version. + +XEmacs 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 General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with XEmacs; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 51 Franklin St - Fifth Floor, +Boston, MA 02110-1301, USA. */ + #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xos.h>
--- a/etc/unicode/other/lao.txt Mon Jan 18 08:44:49 2010 -0600 +++ b/etc/unicode/other/lao.txt Fri Jan 29 15:06:36 2010 -0600 @@ -1,3 +1,23 @@ +## Unicode for Lao +## Copyright (C) 2002 Ben Wing. + +## This file is part of XEmacs. + +## XEmacs is free software; you can redistribute it and/or modify it +## under the terms of the GNU General Public License as published by the +## Free Software Foundation; either version 2, or (at your option) any +## later version. + +## XEmacs 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 General Public License +## for more details. + +## You should have received a copy of the GNU General Public License +## along with XEmacs; see the file COPYING. If not, write to +## the Free Software Foundation, Inc., 51 Franklin St - Fifth Floor, +## Boston, MA 02110-1301, USA. + ## Made up based on the comment in lao.el: ## ;; ISO10646's 0x0E80..0x0EDF are mapped to 0x20..0x7F.
--- a/lib-src/ChangeLog Mon Jan 18 08:44:49 2010 -0600 +++ b/lib-src/ChangeLog Fri Jan 29 15:06:36 2010 -0600 @@ -1,3 +1,9 @@ +2010-01-28 Jerry James <james@xemacs.org> + + * Makefile.in.in: Remove make-msgfile and make-po rules. + * make-msgfile.c: Removed, obsolete code. + * make-po.c: Removed, obsolete code. + 2010-01-15 Ben Wing <ben@xemacs.org> * make-mswin-unicode.pl:
--- a/lib-src/Makefile.in.in Mon Jan 18 08:44:49 2010 -0600 +++ b/lib-src/Makefile.in.in Fri Jan 29 15:06:36 2010 -0600 @@ -126,8 +126,6 @@ PRIVATE_INSTALLABLES = ${PRIVATE_INSTALLABLE_EXES} ${PRIVATE_INSTALLABLE_SCRIPTS} -## These need to be conditional on I18N3: make-msgfile make-po - ## ---------------------------------------------------------------- ## Things that XEmacs uses during the build process itself. ## Not installed. @@ -375,12 +373,6 @@ hexl: ${srcdir}/hexl.c $(CC) $(cflags) ${srcdir}/hexl.c $(ldflags) -o $@ -make-msgfile: ${srcdir}/make-msgfile.c - $(CC) $(cflags) ${srcdir}/make-msgfile.c $(ldflags) -o $@ - -make-po: ${srcdir}/make-po.c - $(CC) $(cflags) ${srcdir}/make-po.c $(ldflags) -o $@ - make-dump-id: ${srcdir}/make-dump-id.c $(CC) $(cflags) ${srcdir}/make-dump-id.c $(ldflags) -o $@
--- a/lib-src/make-msgfile.c Mon Jan 18 08:44:49 2010 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,288 +0,0 @@ -/* #### Old code! Replaced with make-msgfile.lex. */ - - -/* Scan specified C and Lisp files, extracting the following messages: - - C files: - GETTEXT (...) - DEFER_GETTEXT (...) - DEFUN interactive prompts - Lisp files: - (gettext ...) - (dgettext "domain-name" ...) - (defer-gettext ...) - (interactive ...) - - The arguments given to this program are all the C and Lisp source files - of XEmacs. .el and .c files are allowed. There is no support for .elc - files at this time, but they may be specified; the corresponding .el file - will be used. Similarly, .o files can also be specified, and the corresponding - .c file will be used. This helps the makefile pass the correct list of files. - - The results, which go to standard output or to a file specified with -a or -o - (-a to append, -o to start from nothing), are quoted strings wrapped in - gettext(...). The results can be passed to xgettext to produce a .po message - file. -*/ - -#include <stdio.h> -#include <string.h> - -#define LINESIZE 256 -#define GET_LINE fgets (line, LINESIZE, infile) -#define CHECK_EOL(p) if (*(p) == '\0') (p) = GET_LINE -#define SKIP_BLANKS(p) while ((*p) == ' ' || (*p) == '\t') (p)++ - -enum filetype { C_FILE, LISP_FILE, INVALID_FILE }; -/* some brain-dead headers define this ... */ -#undef FALSE -#undef TRUE -enum boolean { FALSE, TRUE }; - -FILE *infile; -FILE *outfile; -char line[LINESIZE]; - - -void scan_file (char *filename); -void process_C_file (void); -void process_Lisp_file (void); -char *copy_up_to_paren (register char *p); -char *copy_quoted_string (register char *p); -enum boolean no_interactive_prompt (register char *q); -char *skip_blanks (register char *p); - - -main (int argc, char *argv[]) -{ - register int i; - - outfile = stdout; - - /* If first two args are -o FILE, output to FILE. */ - i = 1; - if (argc > i + 1 && strcmp (argv[i], "-o") == 0) { - outfile = fopen (argv[++i], "w"); - ++i; - } - /* ...Or if args are -a FILE, append to FILE. */ - if (argc > i + 1 && strcmp (argv[i], "-a") == 0) { - outfile = fopen (argv[++i], "a"); - ++i; - } - if (!outfile) { - fprintf (stderr, "Unable to open output file %s\n", argv[--i]); - return; - } - - for (; i < argc; i++) - scan_file (argv[i]); - - return 0; -} - - -void scan_file (char *filename) -{ - enum filetype type = INVALID_FILE; - register char *p = filename + strlen (filename); - - if (strcmp (p - 4, ".elc") == 0) { - *--p = '\0'; /* Use .el file instead */ - type = LISP_FILE; - } else if (strcmp (p - 3, ".el") == 0) - type = LISP_FILE; - else if (strcmp (p - 2, ".o") == 0) { - *--p = 'c'; /* Use .c file instead */ - type = C_FILE; - } else if (strcmp (p - 2, ".c") == 0) - type = C_FILE; - - if (type == INVALID_FILE) { - fprintf (stderr, "File %s being ignored\n", filename); - return; - } - infile = fopen (filename, "r"); - if (!infile) { - fprintf (stderr, "Unable to open input file %s\n", filename); - return; - } - - fprintf (outfile, "/* %s */\n", filename); - if (type == C_FILE) - process_C_file (); - else - process_Lisp_file (); - fputc ('\n', outfile); - - fclose (infile); -} - - -void process_C_file (void) -{ - register char *p; - char *gettext, *defun; - - while (p = GET_LINE) { - gettext = strstr (p, "GETTEXT"); - defun = strstr (p, "DEFUN"); - if (gettext || defun) { - if (gettext) { - p = gettext; - p += 7; /* Skip over "GETTEXT" */ - } - else if (defun) { - p = defun; - p += 5; /* Skip over "DEFUN" */ - } - - p = skip_blanks (p); - if (*p++ != '(') - continue; - - if (defun) { - register int i; - - for (i = 0; i < 5; i++) /* Skip over commas to doc string */ - while (*p++ != ',') - CHECK_EOL (p); - if (*p == '\n') - p = GET_LINE; - } - - p = skip_blanks (p); - if (*p != '\"') /* Make sure there is a quoted string */ - continue; - - if (defun && no_interactive_prompt (p)) - continue; - - fprintf (outfile, "gettext("); - if (gettext) - p = copy_up_to_paren (p); - else - p = copy_quoted_string (p); - fprintf (outfile, ")\n"); - } - } -} - - -void process_Lisp_file (void) -{ - register char *p; - char *gettext, *interactive; - enum boolean dgettext = FALSE; - - while (p = GET_LINE) { - gettext = strstr (p, "gettext"); - interactive = strstr (p, "(interactive"); - if (gettext || interactive) { - if (!interactive) - p = gettext; - else if (!gettext) - p = interactive; - else if (gettext < interactive) { - p = gettext; - interactive = NULL; - } else { - p = interactive; - gettext = NULL; - } - - if (gettext) { - if (p > line && *(p-1) == 'd') - dgettext = TRUE; - p += 7; /* Skip over "gettext" */ - } else - p += 12; /* Skip over "(interactive" */ - - p = skip_blanks (p); - if (*p != '\"') /* Make sure there is a quoted string */ - continue; - - if (dgettext) { /* Skip first quoted string (domain name) */ - while (*++p != '"') - ; /* null statement */ - ++p; - p = skip_blanks (p); - if (*p != '\"') /* Check for second quoted string (message) */ - continue; - } - - if (interactive && no_interactive_prompt (p)) - continue; - - fprintf (outfile, "gettext("); - p = copy_up_to_paren (p); - fprintf (outfile, ")\n"); - } - } -} - - -/* Assuming p points to some character beyond an opening parenthesis, copy - everything to outfile up to but not including the closing parenthesis. -*/ -char *copy_up_to_paren (register char *p) -{ - for (;;) { - SKIP_BLANKS (p); /* We don't call skip_blanks() in order to */ - CHECK_EOL (p); /* preserve blanks at the beginning of the line */ - if (*p == ')') - break; - - if (*p == '\"') - p = copy_quoted_string (p); - else - fputc (*p++, outfile); - } - return p; -} - - -/* Assuming p points to a quote character, copy the quoted string to outfile. -*/ -char *copy_quoted_string (register char *p) -{ - do { - if (*p == '\\') - fputc (*p++, outfile); - fputc (*p++, outfile); - CHECK_EOL (p); - } while (*p != '\"'); - - fputc (*p++, outfile); - return p; -} - - -/* Return TRUE if the interactive specification consists only - of code letters and no prompt. -*/ -enum boolean no_interactive_prompt (register char *q) -{ - while (++q, *q == '*' || *q == '@') - ; /* null statement */ - if (*q == '\"') - return TRUE; - skip_code_letter: - if (*++q == '\"') - return TRUE; - if (*q == '\\' && *++q == 'n') { - ++q; - goto skip_code_letter; - } - return FALSE; -} - - -char *skip_blanks (register char *p) -{ - while (*p == ' ' || *p == '\t' || *p == '\n') { - p++; - CHECK_EOL (p); - } - return p; -}
--- a/lib-src/make-po.c Mon Jan 18 08:44:49 2010 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,302 +0,0 @@ -/* Generate .po file from doc-string file. - - Scan specified doc-string file, creating .po format messages for processing - with msgfmt. The results go to standard output or to a file specified - with -a or -o (-a to append, -o to start from nothing). - - Kludge to make up for shortcoming in make-docfile and Snarf-documentation: - If arg before input filename is -p, we are scanning an add-on - package, which requires slightly different processing. -*/ - -#include <stdio.h> -#include <stdlib.h> - -#ifndef EXIT_SUCCESS -#define EXIT_SUCCESS 0 -#define EXIT_FAILURE 1 -#endif - -/* #define BUFSIZE 8192 */ -/* #define BUFSIZE 16384 */ -#define BUFSIZE 32768 -#define NEWSTRING 31 /* Character signalling start of new doc string */ -#define LINEEND "\\n" -#define ENDSTRING "\"\n" -#define LINEBEGIN " \"" -#define LINEBREAK ENDSTRING LINEBEGIN - -/* some brain-dead headers define this ... */ -#undef FALSE -#undef TRUE -enum boolean { FALSE, TRUE }; - - -/***********************/ -/* buffer pseudo-class */ -/***********************/ - -typedef struct _buffer -{ - size_t index; /* current position in buf[] */ - size_t size; /* size of buf */ - char *buf; -} buffer_struct; - -#define BUF_NULL {0, 0, NULL} - -int buf_init (buffer_struct *buffer, size_t size); -void buf_free (buffer_struct *buffer); -void buf_clear (buffer_struct *buffer); -int buf_putc (buffer_struct *buffer, int c); -int buf_print (buffer_struct *buffer, const char *s); - - -/********************/ -/* global variables */ -/********************/ - -FILE *infile = NULL; -FILE *outfile = NULL; -buffer_struct buf = BUF_NULL; - - -void scan_file (enum boolean package); -void initialize (void); -void clean_exit (int status); -void buf_putc_safe (int c); -void buf_print_safe (const char *s); -void terminate_string (void); - -main (int argc, char *argv[]) -{ - register int i; - enum boolean package = FALSE; /* TRUE if scanning add-on package */ - - initialize (); - - outfile = stdout; - - /* If first two args are -o FILE, output to FILE. */ - i = 1; - if (argc > i + 1 && strcmp (argv[i], "-o") == 0) { - outfile = fopen (argv[++i], "w"); - ++i; - } - /* ...Or if args are -a FILE, append to FILE. */ - if (argc > i + 1 && strcmp (argv[i], "-a") == 0) { - outfile = fopen (argv[++i], "a"); - ++i; - } - if (!outfile) { - fprintf (stderr, "Unable to open output file %s\n", argv[--i]); - return 1; - } - - if (argc > i && !strcmp (argv[i], "-p")) { - package = TRUE; - ++i; - } - - infile = fopen (argv[i], "r"); - if (!infile) { - fprintf (stderr, "Unable to open input file %s\n", argv[i]); - return 1; - } - - scan_file (package); - clean_exit (EXIT_SUCCESS); -} - - -void scan_file (enum boolean package) -{ - register int c; /* Character read in */ - - fprintf (outfile, "###############\n"); - fprintf (outfile, "# DOC strings #\n"); - fprintf (outfile, "###############\n"); - - while (c = getc (infile), !feof (infile)) { - if (c == NEWSTRING) { - /* If a string was being processed, terminate it. */ - if (buf.index > 0) - terminate_string (); - - /* Skip function or variable name. */ - while (c != '\n') - c = getc (infile); - c = getc (infile); - - /* Begin a new string. */ - fprintf (outfile, "msgid \""); - buf_print_safe ("msgstr \""); - } - - if (c == '\n') { - /* Peek at next character. */ - c = getc (infile); - ungetc (c, infile); - - /* For add-on (i.e., non-preloaded) documentation, ignore the last - carriage return of a string. */ - if (!(package && c == NEWSTRING)) { - fprintf (outfile, LINEEND); - buf_print_safe (LINEEND); - } - - /* If not end of string, continue it on the next line. */ - if (c != NEWSTRING) { - fprintf (outfile, LINEBREAK); - buf_print_safe (LINEBREAK); - } - } - else { - - /* If character is \ or ", precede it by a backslash. */ - if (c == '\\' || c == '\"') { - putc ('\\', outfile); - buf_putc_safe ('\\'); - } - - putc (c, outfile); - buf_putc_safe (c); - } - } - terminate_string (); -} - - -/* initialize sets up the global variables. -*/ -void initialize (void) -{ - if (buf_init (&buf, BUFSIZE) != 0) - clean_exit (EXIT_FAILURE); -} - - -/* clean_exit returns any resources and terminates the program. - An error message is printed if status is EXIT_FAILURE. -*/ -void clean_exit (int status) -{ - if (buf.size > 0) - buf_free (&buf); - if (outfile) - fclose (outfile); - if (infile) - fclose (infile); - - if (status == EXIT_FAILURE) - fprintf (stderr, "make-po abnormally terminated\n"); - exit (status); -} - - -/* buf_putc_safe writes the character c on the global buffer buf, - checking to make sure that the operation was successful. -*/ -void buf_putc_safe (int c) -{ - register int status; - - status = buf_putc (&buf, c); - if (status == EOF) - clean_exit (EXIT_FAILURE); -} - - -/* buf_putc_safe writes the string s on the global buffer buf, - checking to make sure that the operation was successful. -*/ -void buf_print_safe (const char *s) -{ - register int status; - - status = buf_print (&buf, s); - if (status < 0) - clean_exit (EXIT_FAILURE); -} - - -/* terminate_string terminates the current doc string and outputs the buffer. -*/ -void terminate_string (void) - { - fprintf (outfile, ENDSTRING); - - /* Make the "translation" different from the original string. */ - buf_print_safe ("_X"); - - buf_print_safe (ENDSTRING); - fprintf (outfile, "%s", buf.buf); - buf_clear (&buf); - } - - -/*********************************/ -/* buffer pseudo-class functions */ -/*********************************/ - -/* buf_init initializes a buffer to the specified size. - It returns non-zero if the attempt fails. -*/ -int buf_init (buffer_struct *buffer, size_t size) -{ - buffer->buf = malloc (size); - if (buffer->buf == NULL) - return 1; - - buffer->size = size; - buf_clear (buffer); - return 0; -} - - -/* buf_free releases the memory allocated for the buffer. -*/ -void buf_free (buffer_struct *buffer) -{ - free (buffer->buf); - buffer->size = 0; -} - - -/* buf_clear resets a buffer to an empty string. -*/ -void buf_clear (buffer_struct *buffer) -{ - buffer->index = 0; - buffer->buf[0] = '\0'; -} - - -/* buf_putc writes the character c on the buffer. - It returns the character written, or EOF for error. -*/ -int buf_putc (buffer_struct *buffer, int c) -{ - if (buffer->index >= buffer->size) - return EOF; - - buffer->buf[buffer->index++] = c; - return c; -} - - -/* buf_print writes the string s on the buffer. - It returns the number of characters written, or negative if an error occurred. -*/ -int buf_print (buffer_struct *buffer, const char *s) -{ - register int len; - - len = strlen (s); - if (buffer->index + len >= buffer->size) - return -1; - - sprintf (&(buffer->buf[buffer->index]), s); - buffer->index += len; - return len; -}
--- a/lisp/ChangeLog Mon Jan 18 08:44:49 2010 -0600 +++ b/lisp/ChangeLog Fri Jan 29 15:06:36 2010 -0600 @@ -1,3 +1,57 @@ +2010-01-26 Aidan Kehoe <kehoea@parhasard.net> + + * mule/vietnamese.el (viscii): Correct the mapping here, #xA6 is + actually *SMALL* LETTER A WITH CIRCUMFLEX AND HOOK ABOVE. + * mule/cyrillic.el (koi8-c): Correct the mapping here, #x8C is + actually ?\u04D9. Add a case mapping for it. + +2010-01-24 Aidan Kehoe <kehoea@parhasard.net> + + Correct the semantics of #'member*, #'eql, #'assoc* in the + presence of bignums; change the integerp byte code to fixnump + semantics. + + * bytecomp.el (fixnump, integerp, byte-compile-integerp): + Change the integerp byte code to fixnump; add a byte-compile + method to integerp using fixnump and numberp and avoiding a + funcall most of the time, since in the non-core contexts where + integerp is used, it's mostly distinguishing between fixnums and + things that are not numbers at all. + * byte-optimize.el (side-effect-free-fns, byte-after-unbind-ops) + (byte-compile-side-effect-and-error-free-ops): + Replace the integerp bytecode with fixnump; add fixnump to the + side-effect-free-fns. Add the other extended number type + predicates to the list in passing. + + * obsolete.el (floatp-safe): Mark this as obsolete. + + * cl.el (eql): Go into more detail in the docstring here. Don't + bother checking whether both arguments are numbers; one is enough, + #'equal will fail correctly if they have distinct types. + (subst): Replace a call to #'integerp (deciding whether to use + #'memq or not) with one to #'fixnump. + Delete most-positive-fixnum, most-negative-fixnum from this file; + they're now always in C, so they can't be modified from Lisp. + * cl-seq.el (member*, assoc*, rassoc*): + Correct these functions in the presence of bignums. + * cl-macs.el (cl-make-type-test): The type test for a fixnum is + now fixnump. Ditch floatp-safe, use floatp instead. + (eql): Correct this compiler macro in the presence of bignums. + (assoc*): Correct this compiler macro in the presence of bignums. + + * simple.el (undo): + Change #'integerp to #'fixnump here, since we use #'delq with the + same value as ELT a few lines down. + +2010-01-20 Aidan Kehoe <kehoea@parhasard.net> + + * simple.el (handle-pre-motion-command-current-command-is-motion): + This function is called a *lot*, make it faster, making + keysyms-equal inline, calling #'characterp (which doesn't have a + bytecode) much more rarely, and not throwing and catching. This + won't make much difference in practice, but does eliminate losts + of noise from profiling, e.g. at startup. + 2010-01-13 Ben Wing <ben@xemacs.org> * loadup.el: @@ -108,6 +162,11 @@ Remove support in our generated code for emacs versions where keywords are not self-quoting. +2009-12-21 Michael Sperber <mike@xemacs.org> + + * gnuserv.el (gnuserv-program): Specifically look for gnuserv in + `exec-directory'. + 2009-12-18 Aidan Kehoe <kehoea@parhasard.net> * alist.el (modify-alist):
--- a/lisp/byte-optimize.el Mon Jan 18 08:44:49 2010 -0600 +++ b/lisp/byte-optimize.el Fri Jan 29 15:06:36 2010 -0600 @@ -1209,12 +1209,12 @@ (let ((side-effect-free-fns '(% * + - / /= 1+ 1- < <= = > >= abs acos append aref ash asin atan assoc assq - boundp buffer-file-name buffer-local-variables buffer-modified-p - buffer-substring + bigfloat-get-precision boundp buffer-file-name buffer-local-variables + buffer-modified-p buffer-substring capitalize car-less-than-car car cdr ceiling concat ;; coordinates-in-window-p not in XEmacs copy-marker cos count-lines - default-boundp default-value documentation downcase + default-boundp default-value denominator documentation downcase elt exp expt fboundp featurep file-directory-p file-exists-p file-locked-p file-name-absolute-p file-newer-than-file-p file-readable-p file-symlink-p file-writable-p @@ -1233,7 +1233,7 @@ int-to-string length log log10 logand logb logior lognot logxor lsh marker-buffer max member memq min mod - next-window nth nthcdr number-to-string + next-window nth nthcdr number-to-string numerator parse-colon-path plist-get previous-window radians-to-degrees rassq regexp-quote reverse round sin sqrt string< string= string-equal string-lessp string-to-char @@ -1252,7 +1252,8 @@ )) (side-effect-and-error-free-fns '(arrayp atom - bobp bolp buffer-end buffer-list buffer-size buffer-string bufferp + bigfloatp bignump bobp bolp buffer-end buffer-list buffer-size + buffer-string bufferp car-safe case-table-p cdr-safe char-or-string-p char-table-p characterp commandp cons consolep console-live-p consp @@ -1260,7 +1261,7 @@ ;; XEmacs: extent functions, frame-live-p, various other stuff devicep device-live-p dot dot-marker eobp eolp eq eql equal eventp extentp - extent-live-p floatp framep frame-live-p + extent-live-p fixnump floatingp floatp framep frame-live-p get-largest-window get-lru-window hash-table-p identity ignore integerp integer-or-marker-p interactive-p @@ -1271,14 +1272,14 @@ natnump nlistp not null number-or-marker-p numberp one-window-p ;; overlayp not in XEmacs point point-marker point-min point-max processp - range-table-p + rationalp ratiop range-table-p realp selected-window sequencep stringp subrp symbolp syntax-table-p user-full-name user-login-name user-original-login-name user-real-login-name user-real-uid user-uid vector vectorp window-configuration-p window-live-p windowp ;; Functions defined by cl - eql floatp-safe list* subst acons equalp random-state-p + eql list* subst acons equalp random-state-p copy-tree sublis ))) (dolist (fn side-effect-free-fns) @@ -1456,7 +1457,7 @@ (defconst byte-after-unbind-ops '(byte-constant byte-dup - byte-symbolp byte-consp byte-stringp byte-listp byte-numberp byte-integerp + byte-symbolp byte-consp byte-stringp byte-listp byte-numberp byte-fixnump byte-eq byte-not byte-cons byte-list1 byte-list2 ; byte-list3 byte-list4 byte-interactive-p) @@ -1469,7 +1470,7 @@ (defconst byte-compile-side-effect-and-error-free-ops '(byte-constant byte-dup byte-symbolp byte-consp byte-stringp byte-listp - byte-integerp byte-numberp byte-eq byte-equal byte-not byte-car-safe + byte-fixnump byte-numberp byte-eq byte-equal byte-not byte-car-safe byte-cdr-safe byte-cons byte-list1 byte-list2 byte-point byte-point-max byte-point-min byte-following-char byte-preceding-char byte-current-column byte-eolp byte-eobp byte-bolp byte-bobp
--- a/lisp/bytecomp.el Mon Jan 18 08:44:49 2010 -0600 +++ b/lisp/bytecomp.el Fri Jan 29 15:06:36 2010 -0600 @@ -734,7 +734,7 @@ (byte-defop 165 -1 byte-quo) (byte-defop 166 -1 byte-rem) (byte-defop 167 0 byte-numberp) -(byte-defop 168 0 byte-integerp) +(byte-defop 168 0 byte-fixnump) ;; unused: 169 @@ -3101,7 +3101,7 @@ (byte-defop-compiler car-safe 1) (byte-defop-compiler cdr-safe 1) (byte-defop-compiler numberp 1) -(byte-defop-compiler integerp 1) +(byte-defop-compiler fixnump 1) (byte-defop-compiler skip-chars-forward 1-2+1) (byte-defop-compiler skip-chars-backward 1-2+1) (byte-defop-compiler (eql byte-eq) 2) @@ -3817,6 +3817,8 @@ (byte-defop-compiler-1 let) (byte-defop-compiler-1 let*) +(byte-defop-compiler-1 integerp) + (defun byte-compile-progn (form) (byte-compile-body-do-effect (cdr form))) @@ -3999,6 +4001,55 @@ (byte-compile-warn-about-unused-variables)) (byte-compile-out 'byte-unbind (length (car (cdr form)))))) +;; We've renamed the integerp bytecode to fixnump, and changed its semantics +;; accordingly. This means #'integerp itself can't be as fast as it used to +;; be, since it no longer has a bytecode to itself. As it happens, though, +;; most of the non-core calls to #'integerp are in contexts where it is +;; either going to receive a fixnum, or something non-numeric entirely; the +;; contexts where it needs to distinguish between an integer and a float are +;; very rare. So, we can have (integerp X) compile to: +;; +;; (or (fixnump X) (and (numberp X) (funcall #'integerp X))) +;; +;; without the multiple evaluation of X, and where #'fixnump and #'numberp +;; both have bytecodes. We ignore for-effect, because byte-optimize.el will +;; delete this call in its presence. +;; +;; This approach is byte-code compatible with 21.4 and with earlier 21.5 +;; (except that earlier 21.5 with bignum support will confuse Bfixnump and +;; Bintegerp; which it did in dealing with byte-compiled code from 21.4 +;; anyway). + +(defun byte-compile-integerp (form) + (if (/= 2 (length form)) + (byte-compile-subr-wrong-args form 1) + (let ((donetag (byte-compile-make-tag)) + (wintag (byte-compile-make-tag)) + (failtag (byte-compile-make-tag))) + (byte-compile-constant 'integerp) + (byte-compile-form (second form)) + (byte-compile-out 'byte-dup 0) + (byte-compile-out 'byte-fixnump 0) + (byte-compile-goto 'byte-goto-if-not-nil wintag) + (byte-compile-out 'byte-dup 0) + (byte-compile-out 'byte-numberp 0) + (byte-compile-goto 'byte-goto-if-nil failtag) + (byte-compile-out 'byte-call 1) + ;; At this point, the only thing from this function remaining on the + ;; stack is the return value of the called #'integerp, which reflects + ;; exactly what we want. Go directly to donetag, do not discard + ;; anything. + (byte-compile-goto 'byte-goto donetag) + (byte-compile-out-tag failtag) + (byte-compile-discard) + (byte-compile-discard) + (byte-compile-constant nil) + (byte-compile-goto 'byte-goto donetag) + (byte-compile-out-tag wintag) + (byte-compile-discard) + (byte-compile-discard) + (byte-compile-constant t) + (byte-compile-out-tag donetag)))) ;;(byte-defop-compiler-1 /= byte-compile-negated) (byte-defop-compiler-1 atom byte-compile-negated)
--- a/lisp/cl-macs.el Mon Jan 18 08:44:49 2010 -0600 +++ b/lisp/cl-macs.el Fri Jan 29 15:06:36 2010 -0600 @@ -3026,9 +3026,9 @@ (cl-make-type-test val (funcall (get type 'cl-deftype-handler)))) ((memq type '(nil t)) type) ((eq type 'null) `(null ,val)) - ((eq type 'float) `(floatp-safe ,val)) + ((eq type 'float) `(floatp ,val)) ((eq type 'real) `(numberp ,val)) - ((eq type 'fixnum) `(integerp ,val)) + ((eq type 'fixnum) `(fixnump ,val)) ;; XEmacs change: we do not have char-valid-p ((memq type '(character string-char)) `(characterp ,val)) (t @@ -3205,12 +3205,12 @@ (define-compiler-macro eql (&whole form a b) (cond ((eq (cl-const-expr-p a) t) (let ((val (cl-const-expr-val a))) - (if (and (numberp val) (not (integerp val))) + (if (and (numberp val) (not (fixnump val))) (list 'equal a b) (list 'eq a b)))) ((eq (cl-const-expr-p b) t) (let ((val (cl-const-expr-val b))) - (if (and (numberp val) (not (integerp val))) + (if (and (numberp val) (not (fixnump val))) (list 'equal a b) (list 'eq a b)))) ((cl-simple-expr-p a 5) @@ -3226,20 +3226,25 @@ (define-compiler-macro member* (&whole form a list &rest keys) (let ((test (and (= (length keys) 2) (eq (car keys) :test) - (cl-const-expr-val (nth 1 keys))))) + (cl-const-expr-val (nth 1 keys)))) + a-val) (cond ((eq test 'eq) (list 'memq a list)) ((eq test 'equal) (list 'member a list)) ((or (null keys) (eq test 'eql)) (if (eq (cl-const-expr-p a) t) - (list (if (floatp-safe (cl-const-expr-val a)) 'member 'memq) + (list (if (and (numberp (setq a-val (cl-const-expr-val a))) + (not (fixnump a-val))) + 'member + 'memq) a list) (if (eq (cl-const-expr-p list) t) (let ((p (cl-const-expr-val list)) (mb nil) (mq nil)) (if (not (cdr p)) (and p (list 'eql a (list 'quote (car p)))) (while p - (if (floatp-safe (car p)) (setq mb t) - (or (integerp (car p)) (symbolp (car p)) (setq mq t))) + (if (and (numberp (car p)) (not (fixnump (car p)))) + (setq mb t) + (or (fixnump (car p)) (symbolp (car p)) (setq mq t))) (setq p (cdr p))) (if (not mb) (list 'memq a list) (if (not mq) (list 'member a list) form)))) @@ -3248,11 +3253,13 @@ (define-compiler-macro assoc* (&whole form a list &rest keys) (let ((test (and (= (length keys) 2) (eq (car keys) :test) - (cl-const-expr-val (nth 1 keys))))) + (cl-const-expr-val (nth 1 keys)))) + a-val) (cond ((eq test 'eq) (list 'assq a list)) ((eq test 'equal) (list 'assoc a list)) ((and (eq (cl-const-expr-p a) t) (or (null keys) (eq test 'eql))) - (if (floatp-safe (cl-const-expr-val a)) + (if (and (numberp (setq a-val (cl-const-expr-val a))) + (not (fixnump a-val))) (list 'assoc a list) (list 'assq a list))) (t form)))) @@ -3511,7 +3518,7 @@ (cddadr cdr cdadr) (cdddar cdr cddar) (cddddr cdr cdddr))) ;;; Things that are inline. -(proclaim '(inline floatp-safe acons map concatenate notany notevery +(proclaim '(inline acons map concatenate notany notevery ;; XEmacs omission: gethash is builtin cl-set-elt revappend nreconc)) @@ -3523,7 +3530,7 @@ ;;; Things that are side-effect-and-error-free. Moved to byte-optimize.el ;(mapcar (function (lambda (x) (put x 'side-effect-free 'error-free))) -; '(eql floatp-safe list* subst acons equalp random-state-p +; '(eql list* subst acons equalp random-state-p ; copy-tree sublis))
--- a/lisp/cl-seq.el Mon Jan 18 08:44:49 2010 -0600 +++ b/lisp/cl-seq.el Fri Jan 29 15:06:36 2010 -0600 @@ -664,7 +664,7 @@ (while (and cl-list (not (cl-check-test cl-item (car cl-list)))) (setq cl-list (cdr cl-list))) cl-list) - (if (and (numberp cl-item) (not (integerp cl-item))) + (if (and (numberp cl-item) (not (fixnump cl-item))) (member cl-item cl-list) (memq cl-item cl-list)))) @@ -697,7 +697,7 @@ (not (cl-check-test cl-item (car (car cl-alist)))))) (setq cl-alist (cdr cl-alist))) (and cl-alist (car cl-alist))) - (if (and (numberp cl-item) (not (integerp cl-item))) + (if (and (numberp cl-item) (not (fixnump cl-item))) (assoc cl-item cl-alist) (assq cl-item cl-alist)))) @@ -714,7 +714,7 @@ (defun rassoc* (cl-item cl-alist &rest cl-keys) "Find the first item whose cdr matches ITEM in LIST. Keywords supported: :test :test-not :key" - (if (or cl-keys (numberp cl-item)) + (if (or cl-keys (and (numberp cl-item) (not (fixnump cl-item)))) (cl-parsing-keywords (:test :test-not :key :if :if-not) () (while (and cl-alist (or (not (consp (car cl-alist)))
--- a/lisp/cl.el Mon Jan 18 08:44:49 2010 -0600 +++ b/lisp/cl.el Fri Jan 29 15:06:36 2010 -0600 @@ -123,10 +123,17 @@ ;;; Predicates. (defun eql (a b) ; See compiler macro in cl-macs.el - "Return t if the two args are the same Lisp object. -Floating-point numbers of equal value are `eql', but they may not be `eq'." - (or (eq a b) - (and (numberp a) (numberp b) (equal a b)))) + "Return t if the arguments are the same Lisp object, or numerically equal. + +They must be of the same type; the difference between `eq' and `eql' is most +relevant when it comes to the non-fixnum number types. In this +implementation, fixnums of the same numeric value are always `eq', but this +is not true for other numeric types, among them floats, bignums and ratios, +if available. + +See also `=' (which doesn't require that its arguments be of the same type, +but only accepts numeric arguments, characters and markers) and `equal'." + (or (eq a b) (and (numberp a) (equal a b)))) ;;; Generalized variables. These macros are defined here so that they ;;; can safely be used in .emacs files. @@ -317,11 +324,7 @@ ;;; Numbers. -;; XEmacs change: use floatp, which is right even in the presence of ratios -;; and bigfloats -(defun floatp-safe (object) - "Return t if OBJECT is a floating point number." - (floatp object)) +;; XEmacs change: ditch floatp-safe. (defun plusp (number) "Return t if NUMBER is positive." @@ -344,15 +347,6 @@ (defvar *random-state* (vector 'cl-random-state-tag -1 30 (cl-random-time))) -;; XEmacs: These constants are defined in C when 'number-types is provided. -;; They are always defined in C on Emacs. Maybe we should, too. -(unless (featurep 'number-types) -;;; We use `eval' in case VALBITS differs from compile-time to load-time. - (defconst most-positive-fixnum (eval '(lsh -1 -1)) - "The integer closest in value to positive infinity.") - (defconst most-negative-fixnum (eval '(- -1 (lsh -1 -1))) - "The integer closest in value to negative infinity.")) - ;;; The following are set by code in cl-extra.el (defconst most-positive-float nil "The float closest in value to positive infinity.") @@ -616,7 +610,7 @@ "Substitute NEW for OLD everywhere in TREE (non-destructively). Return a copy of TREE with all elements `eql' to OLD replaced by NEW. Keywords supported: :test :test-not :key" - (if (or cl-keys (and (numberp cl-old) (not (integerp cl-old)))) + (if (or cl-keys (and (numberp cl-old) (not (fixnump cl-old)))) (apply 'sublis (list (cons cl-old cl-new)) cl-tree cl-keys) (cl-do-subst cl-new cl-old cl-tree)))
--- a/lisp/gnuserv.el Mon Jan 18 08:44:49 2010 -0600 +++ b/lisp/gnuserv.el Fri Jan 29 15:06:36 2010 -0600 @@ -181,7 +181,7 @@ (function :tag "Other")) :group 'gnuserv) -(defcustom gnuserv-program "gnuserv" +(defcustom gnuserv-program (expand-file-name "gnuserv" exec-directory) "*Program to use as the editing server." :type 'string :group 'gnuserv)
--- a/lisp/mule/cyrillic.el Mon Jan 18 08:44:49 2010 -0600 +++ b/lisp/mule/cyrillic.el Fri Jan 29 15:06:36 2010 -0600 @@ -1166,7 +1166,7 @@ do (put-case-table-pair upper lower case-table)) -;; Support fot the languages of the Caucasus. +;; Support for the languages of the Caucasus. Never widely used. (make-coding-system 'koi8-c 'fixed-width "KOI-8, Caucasus." '(unicode-map @@ -1182,7 +1182,7 @@ (#x89 ?\u04B9) ;; CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE (#x8A ?\u04BB) ;; CYRILLIC SMALL LETTER SHHA (#x8B ?\u2580) ;; UPPER HALF BLOCK - (#x8C ?\u049D) ;; CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE + (#x8C ?\u04D9) ;; CYRILLIC SMALL LETTER SCHWA (#x8D ?\u04E3) ;; CYRILLIC SMALL LETTER I WITH MACRON (#x8E ?\u04E9) ;; CYRILLIC SMALL LETTER BARRED O (#x8F ?\u04EF) ;; CYRILLIC SMALL LETTER U WITH MACRON @@ -1311,6 +1311,7 @@ (?\u04A3 ?\u04A2) ;; EN WITH DESCENDER (?\u049D ?\u049C) ;; KA WITH VERTICAL STROKE (?\u04BB ?\u04BA) ;; SHHA + (?\u04D9 ?\u04D8) ;; SCHWA (?\u04AF ?\u04AE) ;; STRAIGHT U (?\u04B1 ?\u04B0) ;; STRAIGHT U WITH STROKE (?\u0497 ?\u0496)) ;; ZHE WITH DESCENDER
--- a/lisp/mule/vietnamese.el Mon Jan 18 08:44:49 2010 -0600 +++ b/lisp/mule/vietnamese.el Fri Jan 29 15:06:36 2010 -0600 @@ -111,7 +111,7 @@ (#xA3 ?\u1EB7) ;; SMALL LETTER A WITH BREVE AND DOT BELOW (#xA4 ?\u1EA5) ;; SMALL LETTER A WITH CIRCUMFLEX AND ACUTE (#xA5 ?\u1EA7) ;; SMALL LETTER A WITH CIRCUMFLEX AND GRAVE - (#xA6 ?\u1EA8) ;; CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE + (#xA6 ?\u1EA9) ;; SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE (#xA7 ?\u1EAD) ;; SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW (#xA8 ?\u1EBD) ;; SMALL LETTER E WITH TILDE (#xA9 ?\u1EB9) ;; SMALL LETTER E WITH DOT BELOW
--- a/lisp/obsolete.el Mon Jan 18 08:44:49 2010 -0600 +++ b/lisp/obsolete.el Fri Jan 29 15:06:36 2010 -0600 @@ -275,6 +275,9 @@ ;; being called on the values of functions known to return keymaps, ;; or known to return vectors of events instead of strings... +;;; Yes there is; make compiler macros for aref, assq, nconc, checking that +;;; the car of the relevant argument is sane. + (make-obsolete-variable 'executing-macro 'executing-kbd-macro) (define-compatible-function-alias 'interactive-form
--- a/lisp/simple.el Mon Jan 18 08:44:49 2010 -0600 +++ b/lisp/simple.el Fri Jan 29 15:06:36 2010 -0600 @@ -957,7 +957,7 @@ (let ((tail buffer-undo-list) done) (while (and tail (not done) (not (null (car tail)))) - (if (integerp (car tail)) + (if (fixnump (car tail)) (progn (setq done t) (setq buffer-undo-list (delq (car tail) buffer-undo-list)))) @@ -2086,25 +2086,35 @@ (defun handle-pre-motion-command-current-command-is-motion () (and (key-press-event-p last-input-event) - (let ((key (event-key last-input-event)) - (mods (delq 'shift (event-modifiers last-input-event)))) - ;(princ (format "key: %s mods: %s\n" key mods) 'external-debugging-output) - (catch 'handle-pre-motion-command-current-command-is-motion - (flet ((keysyms-equal (a b) - (if (characterp b) - (setq b (intern (char-to-string (downcase b))))) - (eq a b))) - (setq key (if (characterp key) - (intern (char-to-string (downcase key))) - key)) - (dolist (keysym motion-keys-for-shifted-motion) - (when (if (listp keysym) - (and (equal mods (butlast keysym)) - (keysyms-equal key (car (last keysym)))) - (keysyms-equal key keysym)) - (throw 'handle-pre-motion-command-current-command-is-motion - t))) - nil))))) + (macrolet + ((keysyms-equal (&rest args) + `((lambda (a b) + (when (and + ;; As of now, none of the elements of + ;; motion-keys-for-shifted-motion are non-symbols; + ;; this redundant check saves a few hundred + ;; funcalls on startup. + (not (symbolp b)) + (characterp b)) + (setf (car char-list) b + b (intern (concat char-list nil)))) + (eq a b)) + ,@args))) + (loop + for keysym in motion-keys-for-shifted-motion + with key = (event-key last-input-event) + with mods = (delq 'shift (event-modifiers last-input-event)) + with char-list = '(?a) ;; Some random character; the list will be + ;; modified in the constants vector over + ;; time. + initially (if (and (not (symbolp key)) (characterp key)) + (setf (car char-list) key + key (intern (concat char-list nil)))) + thereis (if (listp keysym) + (and (equal mods (butlast keysym)) + (keysyms-equal + key (car (last keysym)))) + (keysyms-equal key keysym)))))) (defun handle-pre-motion-command () (if (and
--- a/lwlib/ChangeLog Mon Jan 18 08:44:49 2010 -0600 +++ b/lwlib/ChangeLog Fri Jan 29 15:06:36 2010 -0600 @@ -1,3 +1,8 @@ +2010-01-28 Jerry James <james@xemacs.org> + + * lwlib-internal.h: Add copyright and license boilerplate text + based on Ben's recollections. + 2009-12-09 Jerry James <james@xemacs.org> * lwlib-Xlw.c: Include needed Xmu headers instead of obsolete xmu.h.
--- a/lwlib/lwlib-internal.h Mon Jan 18 08:44:49 2010 -0600 +++ b/lwlib/lwlib-internal.h Fri Jan 29 15:06:36 2010 -0600 @@ -1,3 +1,24 @@ +/* Implementation-specific definitions for the Lucid Widget Library. + Copyright (C) 1992 Lucid, Inc. + Copyright (C) 2000 Ben Wing. + +This file is part of the Lucid Widget Library. + +The Lucid Widget Library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 1, or (at your option) +any later version. + +The Lucid Widget 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 General Public License for more details. + +You should have received a copy of the GNU General Public License +along with XEmacs; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 51 Franklin St - Fifth Floor, +Boston, MA 02110-1301, USA. */ + #ifndef INCLUDED_lwlib_internal_h_ #define INCLUDED_lwlib_internal_h_
--- a/man/ChangeLog Mon Jan 18 08:44:49 2010 -0600 +++ b/man/ChangeLog Fri Jan 29 15:06:36 2010 -0600 @@ -1,3 +1,58 @@ +2010-01-28 Jerry James <loganjerry@gmail.com> + + * external-widget.texi: Add copyright and license boilerplate text + based on Ben's recollections. + * lispref/internationalization.texi (Documentation String Extraction): + Removed, as it refers to the obsolete make-po program. + +2010-01-23 Aidan Kehoe <kehoea@parhasard.net> + + Generally: be careful to say fixnum, not integer, when talking + about fixed-precision integral types. I'm sure I've missed + instances, both here and in the docstrings, but this is a decent + start. + + * lispref/text.texi (Columns): + Document where only fixnums, not integers generally, are accepted. + (Registers): + Remove some ancient char-int confoundance here. + * lispref/strings.texi (Creating Strings, Creating Strings): + Be more exact in describing where fixnums but not integers in + general are accepted. + (Creating Strings): Use a more contemporary example to illustrate + how concat deals with lists including integers about #xFF. Delete + some obsolete documentation on same. + (Char Table Types): Document that only fixnums are accepted as + values in syntax tables. + * lispref/searching.texi (String Search, Search and Replace): + Be exact in describing where fixnums but not integers in general + are accepted. + * lispref/range-tables.texi (Range Tables): Be exact in describing + them; only fixnums are accepted to describe ranges. + * lispref/os.texi (Killing XEmacs, User Identification) + (Time of Day, Time Conversion): + Be more exact about using fixnum where only fixed-precision + integers are accepted. + * lispref/objects.texi (Integer Type): Be more exact (and + up-to-date) about the possible values for + integers. Cross-reference to documentation of the bignum extension. + (Equality Predicates): + (Range Table Type): + (Array Type): Use fixnum, not integer, to describe a + fixed-precision integer. + (Syntax Table Type): Correct some English syntax here. + * lispref/numbers.texi (Numbers): Change the phrasing here to use + fixnum to mean the fixed-precision integers normal in emacs. + Document that our terminology deviates from that of Common Lisp, + and that we're working on it. + (Compatibility Issues): Reiterate the Common Lisp versus Emacs + Lisp compatibility issues. + (Comparison of Numbers, Arithmetic Operations): + * lispref/commands.texi (Command Loop Info, Working With Events): + * lispref/buffers.texi (Modification Time): + Be more exact in describing where fixnums but not integers in + general are accepted. + 2010-01-06 Jerry James <james@xemacs.org> * internals/internals.texi (Debugging and Testing): Document
--- a/man/external-widget.texi Mon Jan 18 08:44:49 2010 -0600 +++ b/man/external-widget.texi Fri Jan 29 15:06:36 2010 -0600 @@ -7,6 +7,27 @@ @direntry * External Widget: (external-widget). External Client Widget. @end direntry + +This file describes the external client widget for XEmacs. + +Copyright @copyright{} 1993 Ben Wing. + +This file is part of XEmacs. + +XEmacs is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2, or (at your option) any +later version. + +XEmacs 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 General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with XEmacs; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 51 Franklin St - Fifth Floor, +Boston, MA 02110-1301, USA. @end ifinfo @node Top, Using an External Client Widget,, (dir)
--- a/man/lispref/buffers.texi Mon Jan 18 08:44:49 2010 -0600 +++ b/man/lispref/buffers.texi Fri Jan 29 15:06:36 2010 -0600 @@ -524,7 +524,7 @@ If @var{time} is not @code{nil}, it should have the form @code{(@var{high} . @var{low})} or @code{(@var{high} @var{low})}, in -either case containing two integers, each of which holds 16 bits of the +either case containing two fixnums, each of which holds 16 bits of the time. This function is useful if the buffer was not read from the file
--- a/man/lispref/commands.texi Mon Jan 18 08:44:49 2010 -0600 +++ b/man/lispref/commands.texi Fri Jan 29 15:06:36 2010 -0600 @@ -762,7 +762,7 @@ @defvar echo-keystrokes This variable determines how much time should elapse before command -characters echo. Its value must be an integer, which specifies the +characters echo. Its value must be a float or a fixnum, which specifies the number of seconds to wait before echoing. If the user types a prefix key (say @kbd{C-x}) and then delays this many seconds before continuing, the key @kbd{C-x} is echoed in the echo area. Any subsequent characters @@ -1324,7 +1324,7 @@ @item @code{button} The event button. This an integer, either 1, 2 or 3. It is allowed -only for button-press and button-release events. +for button-press, button-release and misc-user events. @item @code{modifiers} The event modifiers. This is a list of modifier symbols. It is allowed
--- a/man/lispref/internationalization.texi Mon Jan 18 08:44:49 2010 -0600 +++ b/man/lispref/internationalization.texi Fri Jan 29 15:06:36 2010 -0600 @@ -35,7 +35,6 @@ * Level 3 Primitives:: * Dynamic Messaging:: * Domain Specification:: -* Documentation String Extraction:: @end menu @node Level 3 Basics @@ -168,25 +167,6 @@ @end example @end defun - -@node Documentation String Extraction -@subsection Documentation String Extraction - -The utility @file{etc/make-po} scans the file @code{DOC} to extract -documentation strings and creates a message file @code{doc.po}. This file -may then be inserted within @code{emacs.po}. - -Currently, @code{make-po} is hard-coded to read from @code{DOC} and write -to @code{doc.po}. In order to extract documentation strings from an add-on -package, first run @code{make-docfile} on the package to produce the -@code{DOC} file. Then run @code{make-po -p} with the @code{-p} argument to -indicate that we are extracting documentation for an add-on package. - -(The @code{-p} argument is a kludge to make up for a subtle difference -between pre-loaded documentation and add-on documentation: For add-on -packages, the final carriage returns in the strings produced by -@code{make-docfile} must be ignored.) - @node I18N Level 4 @section I18N Level 4
--- a/man/lispref/numbers.texi Mon Jan 18 08:44:49 2010 -0600 +++ b/man/lispref/numbers.texi Fri Jan 29 15:06:36 2010 -0600 @@ -9,13 +9,13 @@ @cindex integers @cindex numbers - XEmacs supports two to five numeric data types. @dfn{Integers} and + XEmacs supports two to five numeric data types. @dfn{Fixnums} and @dfn{floating point numbers} are always supported. As a build-time option, @dfn{bignums}, @dfn{ratios}, and @dfn{bigfloats} may be enabled on some platforms. - Integers, which are what Common Lisp calls -@dfn{fixnums}, are whole numbers such as @minus{}3, 0, #b0111, #xFEED, + Fixnums (called just @dfn{integers} in GNU Emacs and older versions +of XEmacs) are whole numbers such as @minus{}3, 0, #b0111, #xFEED, #o744. Their values are exact, and their range is limited. The number prefixes `#b', `#o', and `#x' are supported to represent numbers in binary, octal, and hexadecimal notation (or radix). Floating point @@ -52,14 +52,15 @@ The exact rules are more carefully explained elsewhere (@pxref{Canonicalization and Contagion}). - Note that the term ``integer'' is used throughout the XEmacs -documentation and code to mean ``fixnum''. This is inconsistent with -Common Lisp, and likely to cause confusion. Similarly, ``float'' is -used to mean ``fixed precision floating point number'', and the Common -Lisp distinctions among @dfn{short-floats}, @dfn{long-floats}, -@emph{etc.}, and bigfloats (which are not standardized in Common Lisp) -are not reflected in XEmacs terminology. (Volunteers to fix this in the -XEmacs manuals would be heartily welcomed.) + Common Lisp terminology and historical Emacs terminology conflict +here, to an extent. We attempt to use ``fixnum'' and ``integer'' +consistently, but older XEmacs and GNU Emacs code and documentation use +the latter to mean the former. ``Float'' is used in Emacs documentation +to mean ``fixed precision floating point number'', and the Common Lisp +distinctions among @dfn{short-floats}, @dfn{long-floats}, @emph{etc.}, +and bigfloats (which are not standardized in Common Lisp) are not +reflected in XEmacs terminology. We're working on this, but volunteers +to fix it in the XEmacs manuals would be heartily welcomed. @menu * Integer Basics:: Representation and range of integers. @@ -541,12 +542,11 @@ yet.) @item -Terminology is not Common-Lisp-conforming. For example, ``integer'' for -Emacs Lisp means what Common Lisp calls ``fixnum''. This issue is being -investigated, but the use of ``integer'' for fixnum is pervasive and may -cause backward-compatibility and GNU-Emacs-compatibility problems. -There are similar issues for floating point numbers. Since Emacs Lisp -has not had a ratio type before, there should be no problems there. +Our documentation's terminology, and our API terminology, is not always +Common-Lisp-conforming. Many places use ``integer'' where ``fixnum'' +better reflects what the code accepts or produces; there are similar +issues for the varying types of floating point numbers. Since Emacs +Lisp has not had a ratio type before, there are no problems there. @item An atom with ratio read syntax now returns a number, not a symbol. @@ -759,8 +759,8 @@ @b{Common Lisp note:} Comparing numbers in Common Lisp always requires @code{=} because Common Lisp implements multi-word integers, and two distinct integer objects can have the same numeric value. XEmacs Lisp -can have just one integer object for any given value because it has a -limited range of integer values. +can have just one fixnum object for any given value because it has a +limited range of fixnum values. @end quotation In addition to numbers, all of the following functions also accept @@ -914,7 +914,8 @@ It is important to note that in XEmacs Lisp, arithmetic functions do not check for overflow. Thus @code{(1+ 134217727)} may evaluate to -@minus{}134217728, depending on your hardware. +@minus{}134217728, depending on your hardware and whether your XEmacs +supports bignums. @defun 1+ number This function returns @var{number} plus one. @var{number} may be a
--- a/man/lispref/objects.texi Mon Jan 18 08:44:49 2010 -0600 +++ b/man/lispref/objects.texi Fri Jan 29 15:06:36 2010 -0600 @@ -290,31 +290,25 @@ @node Integer Type @subsection Integer Type - The range of values for integers in XEmacs Lisp is @minus{}134217728 to -134217727 (28 bits; i.e., -@ifinfo --2**27 -@end ifinfo -@tex -$-2^{27}$ -@end tex -to -@ifinfo -2**27 - 1) -@end ifinfo -@tex -$2^{28}-1$) -@end tex -on most machines. (Some machines, in particular 64-bit machines such as -the DEC Alpha, may provide a wider range.) It is important to note that -the XEmacs Lisp arithmetic functions do not check for overflow. Thus -@code{(1+ 134217727)} is @minus{}134217728 on most machines. (However, -you @emph{will} get an error if you attempt to read an out-of-range -number using the Lisp reader.) - - The read syntax for integers is a sequence of (base ten) digits with -an optional sign at the beginning. (The printed representation produced -by the Lisp interpreter never has a leading @samp{+}.) + In XEmacs Lisp, integers can be fixnums (that is, fixed-precision +integers) or bignums (arbitrary-precision integers), if compile-time +configuration supports this. The read syntax for the two types is the +same, the type chosen depending on the numeric values involved. + + The range of values for fixnums in XEmacs Lisp is given by the +constants @code{most-positive-fixnum} and @code{most-negative-fixnum}. +On 32-bit machines, these constants reflect 31 value bits, ranging from +@minus{}1073741824 to 1073741823. + + In the absence of @xref{The Bignum Extension}, XEmacs Lisp +arithmetic functions do not check for overflow; so the code snippet +@code{(= most-negative-fixnum (1+ most-positive-fixnum))} will give +@code{t}. However, you @emph{will} get an error if you attempt to read +an out-of-range number using the Lisp reader. + + The main read syntax for integers is a sequence of base ten digits +with an optional sign at the beginning. (The printed representation +produced by the Lisp interpreter never has a leading @samp{+}.) @example @group @@ -1022,7 +1016,7 @@ read syntax; see @ref{String Type}, @ref{Vector Type}, and @ref{Bit Vector Type}. - An array may have any length up to the largest integer; but once + An array may have any length up to the largest fixnum; but once created, it has a fixed size. The first element of an array has index zero, the second element has index 1, and so on. This is called @dfn{zero-origin} indexing. For example, an array of four elements has @@ -1331,7 +1325,7 @@ @subsection Range Table Type @cindex range table type - A @dfn{range table} is a table that maps from ranges of integers to + A @dfn{range table} is a table that maps from ranges of fixnums to arbitrary Lisp objects. Range tables automatically combine overlapping ranges that map to the same Lisp object, and operations are provided for mapping over all of the ranges in a range table. @@ -1714,7 +1708,7 @@ @subsection Syntax Table Type Under XEmacs 20, a @dfn{syntax table} is a particular type of char -table. Under XEmacs 19, a syntax table a vector of 256 integers. In +table. Under XEmacs 19, a syntax table is a vector of 256 integers. In both cases, each element defines how one character is interpreted when it appears in a buffer. For example, in C mode (@pxref{Major Modes}), the @samp{+} character is punctuation, but in Lisp mode it is a valid @@ -2245,7 +2239,7 @@ change in one will be reflected by the same change in the other. @code{eq} returns @code{t} if @var{object1} and @var{object2} are -integers with the same value. It is preferable to use @code{=} or +fixnums with the same value. It is preferable to use @code{=} or @code{eql} in many contexts for numeric comparison, especially since bignums (integers with values that would have otherwise overflowed, only available on some builds) with the same value are not @code{eq};
--- a/man/lispref/os.texi Mon Jan 18 08:44:49 2010 -0600 +++ b/man/lispref/os.texi Fri Jan 29 15:06:36 2010 -0600 @@ -419,7 +419,7 @@ @deffn Command kill-emacs &optional exit-data This function exits the XEmacs process and kills it. -If @var{exit-data} is an integer, then it is used as the exit status +If @var{exit-data} is a fixnum, then it is used as the exit status of the XEmacs process. (This is useful primarily in batch operation; see @ref{Batch Mode}.) @@ -765,7 +765,7 @@ on the effective @sc{uid}, not the real @sc{uid}. If you specify @var{uid}, the value is the user name that corresponds -to @var{uid} (which should be an integer). +to @var{uid} (which should be a fixnum). @example @group @@ -884,7 +884,7 @@ @c Emacs 19 feature The argument @var{time-value}, if given, specifies a time to format instead of the current time. The argument should be a list whose first -two elements are integers. Thus, you can use times obtained from +two elements are fixnums. Thus, you can use times obtained from @code{current-time} (see below) and from @code{file-attributes} (@pxref{File Attributes}). @@ -935,15 +935,15 @@ The argument @var{time-value}, if given, specifies a time to analyze instead of the current time. The argument should be a cons cell -containing two integers, or a list whose first two elements are -integers. Thus, you can use times obtained from @code{current-time} +containing two fixnums, or a list whose first two elements are +fixnums. Thus, you can use times obtained from @code{current-time} (see above) and from @code{file-attributes} (@pxref{File Attributes}). @end defun @node Time Conversion @section Time Conversion - These functions convert time values (lists of two or three integers) + These functions convert time values (lists of two or three fixnums) to strings or to calendrical information. There is also a function to convert calendrical information to a time value. You can get time values from the functions @code{current-time} (@pxref{Time of Day}) and
--- a/man/lispref/positions.texi Mon Jan 18 08:44:49 2010 -0600 +++ b/man/lispref/positions.texi Fri Jan 29 15:06:36 2010 -0600 @@ -505,7 +505,7 @@ @var{pixels} is negative. The optional second argument @var{window} is the window to move in, and defaults to the selected window. The optional third argument @var{how} specifies the stopping condition. A -negative integer indicates that the motion should be no more +negative fixnum indicates that the motion should be no more than @var{pixels}. A positive value indicates that the motion should be at least @var{pixels}. Any other value indicates that the motion should be as close as possible to @var{pixels}.
--- a/man/lispref/processes.texi Mon Jan 18 08:44:49 2010 -0600 +++ b/man/lispref/processes.texi Fri Jan 29 15:06:36 2010 -0600 @@ -757,7 +757,7 @@ @code{process-connection-type} in @ref{Asynchronous Processes}. Some of the functions below take a @var{signal} argument, which -identifies a signal to be sent. It must be either an integer or a +identifies a signal to be sent. It must be either a fixnum or a symbol which names the signal, like @code{SIGSEGV}. @defun process-send-signal signal &optional process current-group
--- a/man/lispref/range-tables.texi Mon Jan 18 08:44:49 2010 -0600 +++ b/man/lispref/range-tables.texi Fri Jan 29 15:06:36 2010 -0600 @@ -7,8 +7,8 @@ @chapter Range Tables @cindex Range Tables -A range table is a table that efficiently associated values with -ranges of integers. +A range table is a table that efficiently associates values with +ranges of fixnums. Note that range tables have a read syntax, like this:
--- a/man/lispref/searching.texi Mon Jan 18 08:44:49 2010 -0600 +++ b/man/lispref/searching.texi Fri Jan 29 15:06:36 2010 -0600 @@ -80,7 +80,7 @@ to return the new position of point in that case, but some programs may depend on a value of @code{nil}.) -If @var{count} is supplied (it must be an integer), then the search is +If @var{count} is supplied (it must be a fixnum), then the search is repeated that many times (each time starting at the end of the previous time's match). If @var{count} is negative, the search direction is backward. If the successive searches succeed, the function succeeds, @@ -1039,7 +1039,7 @@ with. If it is a string, that string is used. It can also be a list of strings, to be used in cyclic order. -If @var{repeat-count} is non-@code{nil}, it should be an integer. Then +If @var{repeat-count} is non-@code{nil}, it should be a fixnum. Then it specifies how many times to use each of the strings in the @var{replacements} list before advancing cyclicly to the next one.
--- a/man/lispref/strings.texi Mon Jan 18 08:44:49 2010 -0600 +++ b/man/lispref/strings.texi Fri Jan 29 15:06:36 2010 -0600 @@ -145,7 +145,7 @@ @defun make-string length character This function returns a new string consisting entirely of @var{length} successive copies of @var{character}. @var{length} must be a -non-negative integer. +non-negative fixnum. @example (make-string 5 ?x) @@ -224,7 +224,7 @@ @xref{Duplicable Extents}. A @code{wrong-type-argument} error is signaled if either @var{start} or -@var{end} is not an integer or @code{nil}. An @code{args-out-of-range} +@var{end} is not a fixnum or @code{nil}. An @code{args-out-of-range} error is signaled if @var{start} indicates a character following @var{end}, or if either integer is out of range for @var{string}. @@ -246,8 +246,8 @@ @example (concat "abc" "-def") @result{} "abc-def" -(concat "abc" (list 120 (+ 256 121)) [122]) - @result{} "abcxyz" +(equal (concat "abc" (list 120 (+ 256 121)) [122]) (format "abcx%cz" 377)) + @result{} t ;; @r{@code{nil} is an empty sequence.} (concat "abc" nil "-def") @result{} "abc-def" @@ -258,30 +258,9 @@ @end example @noindent -The second example above shows how characters stored in strings are -taken modulo 256. In other words, each character in the string is -stored in one byte. - The @code{concat} function always constructs a new string that is not @code{eq} to any existing string. -When an argument is an integer (not a sequence of integers), it is -converted to a string of digits making up the decimal printed -representation of the integer. @strong{Don't use this feature; we plan -to eliminate it. If you already use this feature, change your programs -now!} The proper way to convert an integer to a decimal number in this -way is with @code{format} (@pxref{Formatting Strings}) or -@code{number-to-string} (@pxref{String Conversion}). - -@example -@group -(concat 137) - @result{} "137" -(concat 54 321) - @result{} "54321" -@end group -@end example - For information about other concatenation functions, see the description of @code{mapconcat} in @ref{Mapping Functions}, @code{vconcat} in @ref{Vectors}, @code{bvconcat} in @ref{Bit Vectors}, and @code{append} @@ -1189,7 +1168,7 @@ @item syntax Used for syntax tables, which specify the syntax of a particular character. Higher-level Lisp functions are provided for -working with syntax tables. The valid values are integers. +working with syntax tables. The valid values are fixnums. @end table @defun char-table-type char-table
--- a/man/lispref/text.texi Mon Jan 18 08:44:49 2010 -0600 +++ b/man/lispref/text.texi Fri Jan 29 15:06:36 2010 -0600 @@ -1679,7 +1679,7 @@ @var{force} is the special value @code{coerce}, it says to add whitespace at the end of the line to reach that column. -If @var{column} is not a non-negative integer, an error is signaled. +If @var{column} is not a non-negative fixnum, an error is signaled. The return value is the column number actually moved to. @end defun @@ -2698,7 +2698,7 @@ @var{contents})}. Normally, there is one element for each XEmacs register that has been used. -The object @var{name} is a character (an integer) identifying the +The object @var{name} is a character identifying the register. The object @var{contents} is a string, marker, or list representing the register contents. A string represents text stored in the register. A marker represents a position. A list represents a
--- a/nt/ChangeLog Mon Jan 18 08:44:49 2010 -0600 +++ b/nt/ChangeLog Fri Jan 29 15:06:36 2010 -0600 @@ -1,3 +1,9 @@ +2010-01-28 Jerry James <james@xemacs.org> + + * compface.mak: Add license and copyright boilerplate text based + on Ben's recollections. + * tiff.mak: Ditto. + 2009-12-21 Jerry James <james@xemacs.org> * xemacs.dsp: Remove references to OffiX files.
--- a/nt/compface.mak Mon Jan 18 08:44:49 2010 -0600 +++ b/nt/compface.mak Fri Jan 29 15:06:36 2010 -0600 @@ -1,7 +1,23 @@ -# -# Compface Makefile for Microsoft NMAKE -# Based on xpm.mak -# +## Compface Makefile for Microsoft NMAKE +## Based on xpm.mak +## Copyright (C) 2001 Ben Wing. + +## This file is part of XEmacs. + +## XEmacs is free software; you can redistribute it and/or modify it +## under the terms of the GNU General Public License as published by the +## Free Software Foundation; either version 2, or (at your option) any +## later version. + +## XEmacs 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 General Public License +## for more details. + +## You should have received a copy of the GNU General Public License +## along with XEmacs; see the file COPYING. If not, write to +## the Free Software Foundation, Inc., 51 Franklin St - Fifth Floor, +## Boston, MA 02110-1301, USA. !if !defined(DEBUG_XEMACS) DEBUG_XEMACS=0
--- a/nt/tiff.mak Mon Jan 18 08:44:49 2010 -0600 +++ b/nt/tiff.mak Fri Jan 29 15:06:36 2010 -0600 @@ -1,6 +1,23 @@ -# -# TIFF makefile for Microsoft nmake -# +## TIFF makefile for Microsoft nmake +## Copyright (C) 2001 Ben Wing. + +## This file is part of XEmacs. + +## XEmacs is free software; you can redistribute it and/or modify it +## under the terms of the GNU General Public License as published by the +## Free Software Foundation; either version 2, or (at your option) any +## later version. + +## XEmacs 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 General Public License +## for more details. + +## You should have received a copy of the GNU General Public License +## along with XEmacs; see the file COPYING. If not, write to +## the Free Software Foundation, Inc., 51 Franklin St - Fifth Floor, +## Boston, MA 02110-1301, USA. + !if !defined(DEBUG_XEMACS) DEBUG_XEMACS=0 !endif
--- a/src/ChangeLog Mon Jan 18 08:44:49 2010 -0600 +++ b/src/ChangeLog Fri Jan 29 15:06:36 2010 -0600 @@ -1,3 +1,24 @@ +2010-01-28 Jerry James <james@xemacs.org> + + * Makefile.in.in: Remove internationalization rules, since the + lib-src programs they invoke are now gone. + +2010-01-28 Ben Wing <ben@xemacs.org> + + * syswindows.h: + Add typedefs for PCVOID and PDWORD_PTR for non-Cygwin-headers folks + (i.e. Visual Studio et al.). + +2010-01-27 Aidan Kehoe <kehoea@parhasard.net> + + * number.c (Fdenominator): + Oops, change #else to #endif here; thank you Vin Shelton, thank + you Robert Delius Royar. + +2010-01-27 Ben Wing <ben@xemacs.org> + + * casetab.c: Typo in comment. + 2010-01-18 Ben Wing <ben@xemacs.org> * redisplay-gtk.c: @@ -210,6 +231,83 @@ Declare some temporary pointer variables const to avoid compile errors under C++ and/or Visual Studio 6. +2010-01-24 Aidan Kehoe <kehoea@parhasard.net> + + * number.c (Fnumerator, Fdenominator, Fcanonicalize_number): + Be more careful to return integers in their canonical forms here, + and to give the same answer all the time when treating a rational + that is itself is an integer as a ratio. + +2010-01-24 Aidan Kehoe <kehoea@parhasard.net> + + Fix problems with #'eql, extended number types, and the hash table + implementation; change the Bintegerp bytecode to fixnump semantics + even on bignum builds, since #'integerp can have a fast + implementation in terms of #'fixnump for most of its extant uses, + but not vice-versa. + + * lisp.h: Always #include number.h; we want the macros provided in + it, even if the various number types are not available. + * number.h (NON_FIXNUM_NUMBER_P): New macro, giving 1 when its + argument is of non-immediate number type. Equivalent to FLOATP if + WITH_NUMBER_TYPES is not defined. + + * elhash.c (lisp_object_eql_equal, lisp_object_eql_hash): + Use NON_FIXNUM_NUMBER_P in these functions, instead of FLOATP, + giving more correct behaviour in the presence of the extended + number types. + * bytecode.c (Bfixnump, execute_optimized_program): + Rename Bintegerp to Bfixnump; change its semantics to reflect the + new name on builds with bignum support. + + * data.c (Ffixnump, Fintegerp, syms_of_data, vars_of_data): + Always make #'fixnump available, even on non-BIGNUM builds; + always implement #'integerp in this file, even on BIGNUM builds. + Move most-positive-fixnum, most-negative-fixnum here from + number.c, so they are Lisp constants even on builds without number + types, and attempts to change or bind them error. + Use the NUMBERP and INTEGERP macros even on builds without + extended number types. + * data.c (fixnum_char_or_marker_to_int): + Rename this function from integer_char_or_marker_to_int, to better + reflect the arguments it accepts. + + * number.c (Fevenp, Foddp, syms_of_number): + Never provide #'integerp in this file. Remove #'oddp, + #'evenp; their implementations are overridden by those in cl.el. + * number.c (vars_of_number): + most-positive-fixnum, most-negative-fixnum are no longer here. + +>>>>>>> other +2010-01-17 Vin Shelton <acs@xemacs.org> + + * fileio.c (check_writable): Remove cast from 2010-01-14 + + * syswindows.h: Use consts in macros where appropriate in lieu of + cast in check_writable(). Patch from Ben Wing. + +2010-01-16 Aidan Kehoe <kehoea@parhasard.net> + + * config.h.in: + * floatfns.c (emacs_rint): + Don't look for rint in configure, always use our own + implementation that rounds to the even number in the case of + ambiguity, for consistency with the bignum code. + +2010-01-14 Vin Shelton <acs@xemacs.org> + + * fileio.c (check_writable): Fix compilation error under Visual + Studio 6. + + * sysfile.h: + Add conditional definition for EOVERFLOW, which isn't defined + under Visual Studio 6. + +2010-01-14 Didier Verna <didier@xemacs.org> + + * faces.c (complex_vars_of_faces): change X11 bgcolor fallback of + default face to match that of gui element face. + 2010-01-14 Ben Wing <ben@xemacs.org> * buffer.h:
--- a/src/Makefile.in.in Mon Jan 18 08:44:49 2010 -0600 +++ b/src/Makefile.in.in Fri Jan 29 15:06:36 2010 -0600 @@ -368,10 +368,6 @@ LIBES = $(lwlib_lib) $(malloclib) $(ld_libs_all) $(lib_gcc) -#ifdef I18N3 -mo_file = $(LIB_SRC)/emacs.mo -#endif - ######################################################################### ## Implicit rules ## ######################################################################### @@ -664,35 +660,6 @@ ## Subsidiary dependency rules ## ######################################################################### -#ifdef I18N3 - -# if defined(SPARC) && !defined(USG) - xgettext= /usr/openwin/bin/xgettext - xgettext_args= -o emacs -m_X messages - msgfmt= /usr/openwin/bin/msgfmt -# else - xgettext= xgettext - xgettext_args= -s -d emacs -M_X messages - msgfmt= msgfmt -#endif - -$(LIB_SRC)/emacs.po: $(LIB_SRC)/make-msgfile $(LIB_SRC)/make-po $(objs) - $(LIB_SRC)/make-msgfile -o $(LIB_SRC)/messages $(objs) - cd $(LIB_SRC) && $(xgettext) $(xgettext_args) - $(RM) $(LIB_SRC)/emacs.po - cd $(LIB_SRC) && $(LIB_SRC)/make-po -a $(LIB_SRC)/emacs.po DOC - -$(LIB_SRC)/emacs.mo: $(LIB_SRC)/emacs.po - cd $(LIB_SRC)/ && $(msgfmt) -o emacs.mo emacs.po - -$(LIB_SRC)/make-msgfile: - cd $(LIB_SRC) && $(MAKE) $(RECURSIVE_MAKE_ARGS) make-msgfile - -$(LIB_SRC)/make-po: - cd $(LIB_SRC) && $(MAKE) $(RECURSIVE_MAKE_ARGS) make-po - -#endif /* I18N3 */ - TopLevelEmacsShell.o : $(SRC)/EmacsShell-sub.c config.h xintrinsicp.h EmacsShellP.h $(CC) -c $(cflags) -DDEFINE_TOP_LEVEL_EMACS_SHELL $(SRC)/EmacsShell-sub.c mv EmacsShell-sub.o TopLevelEmacsShell.o
--- a/src/bytecode.c Mon Jan 18 08:44:49 2010 -0600 +++ b/src/bytecode.c Fri Jan 29 15:06:36 2010 -0600 @@ -232,7 +232,7 @@ Bquo = 0245, Brem = 0246, Bnumberp = 0247, - Bintegerp = 0250, + Bfixnump = 0250, /* Was Bintegerp. */ BRgoto = 0252, BRgotoifnil = 0253, @@ -1076,12 +1076,8 @@ #endif break; - case Bintegerp: -#ifdef HAVE_BIGNUM - TOP_LVALUE = INTEGERP (TOP) ? Qt : Qnil; -#else + case Bfixnump: TOP_LVALUE = INTP (TOP) ? Qt : Qnil; -#endif break; case Beq:
--- a/src/casetab.c Mon Jan 18 08:44:49 2010 -0600 +++ b/src/casetab.c Fri Jan 29 15:06:36 2010 -0600 @@ -53,7 +53,7 @@ entry; these groups are called "equivalence classes" and `eqv' lists them by linking the characters in each equivalence class together in a circular list. That is, to find out all all the members of a given char's - equivalence classe, you need something like the following code: + equivalence class, you need something like the following code: (let* ((char ?i) (original-char char)
--- a/src/config.h.in Mon Jan 18 08:44:49 2010 -0600 +++ b/src/config.h.in Fri Jan 29 15:06:36 2010 -0600 @@ -415,7 +415,6 @@ #undef HAVE_READLINK #undef HAVE_RENAME #undef HAVE_RES_INIT -#undef HAVE_RINT #undef HAVE_RMDIR #undef HAVE_SELECT #undef HAVE_SETITIMER
--- a/src/data.c Mon Jan 18 08:44:49 2010 -0600 +++ b/src/data.c Fri Jan 29 15:06:36 2010 -0600 @@ -65,6 +65,8 @@ Lisp_Object Qerror_lacks_explanatory_string; Lisp_Object Qfloatp; +Fixnum Vmost_negative_fixnum, Vmost_positive_fixnum; + #ifdef DEBUG_XEMACS int debug_issue_ebola_notices; @@ -420,7 +422,7 @@ */ (integer)) { - CHECK_INT (integer); + CHECK_INTEGER (integer); if (CHAR_INTP (integer)) return make_char (XINT (integer)); else @@ -456,31 +458,34 @@ return CHAR_OR_CHAR_INTP (object) || STRINGP (object) ? Qt : Qnil; } -#ifdef HAVE_BIGNUM -/* In this case, integerp is defined in number.c. */ DEFUN ("fixnump", Ffixnump, 1, 1, 0, /* Return t if OBJECT is a fixnum. + +In this implementation, a fixnum is an immediate integer, and has a +maximum value described by the constant `most-positive-fixnum'. This +contrasts with bignums, integers where the values are limited by your +available memory. */ (object)) { return INTP (object) ? Qt : Qnil; } -#else DEFUN ("integerp", Fintegerp, 1, 1, 0, /* -Return t if OBJECT is an integer. +Return t if OBJECT is an integer, nil otherwise. + +On builds without bignum support, this function is identical to `fixnump'. */ (object)) { - return INTP (object) ? Qt : Qnil; + return INTEGERP (object) ? Qt : Qnil; } -#endif DEFUN ("integer-or-marker-p", Finteger_or_marker_p, 1, 1, 0, /* Return t if OBJECT is an integer or a marker (editor pointer). */ (object)) { - return INTP (object) || MARKERP (object) ? Qt : Qnil; + return INTEGERP (object) || MARKERP (object) ? Qt : Qnil; } DEFUN ("integer-or-char-p", Finteger_or_char_p, 1, 1, 0, /* @@ -488,7 +493,7 @@ */ (object)) { - return INTP (object) || CHARP (object) ? Qt : Qnil; + return INTEGERP (object) || CHARP (object) ? Qt : Qnil; } DEFUN ("integer-char-or-marker-p", Finteger_char_or_marker_p, 1, 1, 0, /* @@ -496,7 +501,7 @@ */ (object)) { - return INTP (object) || CHARP (object) || MARKERP (object) ? Qt : Qnil; + return INTEGERP (object) || CHARP (object) || MARKERP (object) ? Qt : Qnil; } DEFUN ("natnump", Fnatnump, 1, 1, 0, /* @@ -542,11 +547,7 @@ */ (object)) { -#ifdef WITH_NUMBER_TYPES return NUMBERP (object) ? Qt : Qnil; -#else - return INT_OR_FLOATP (object) ? Qt : Qnil; -#endif } DEFUN ("number-or-marker-p", Fnumber_or_marker_p, 1, 1, 0, /* @@ -554,7 +555,7 @@ */ (object)) { - return INT_OR_FLOATP (object) || MARKERP (object) ? Qt : Qnil; + return NUMBERP (object) || MARKERP (object) ? Qt : Qnil; } DEFUN ("number-char-or-marker-p", Fnumber_char_or_marker_p, 1, 1, 0, /* @@ -562,9 +563,7 @@ */ (object)) { - return (INT_OR_FLOATP (object) || - CHARP (object) || - MARKERP (object)) + return (NUMBERP (object) || CHARP (object) || MARKERP (object)) ? Qt : Qnil; } @@ -740,6 +739,19 @@ if (INTP (index_)) idx = XINT (index_); else if (CHARP (index_)) idx = XCHAR (index_); /* yuck! */ +#ifdef HAVE_BIGNUM + else if (BIGNUMP (index_)) + { + Lisp_Object canon = Fcanonicalize_number (index_); + if (EQ (canon, index_)) + { + /* We don't support non-fixnum indices. */ + goto range_error; + } + index_ = canon; + goto retry; + } +#endif else { index_ = wrong_type_argument (Qinteger_or_char_p, index_); @@ -795,6 +807,19 @@ if (INTP (index_)) idx = XINT (index_); else if (CHARP (index_)) idx = XCHAR (index_); /* yuck! */ +#ifdef HAVE_BIGNUM + else if (BIGNUMP (index_)) + { + Lisp_Object canon = Fcanonicalize_number (index_); + if (EQ (canon, index_)) + { + /* We don't support non-fixnum indices. */ + goto range_error; + } + index_ = canon; + goto retry; + } +#endif else { index_ = wrong_type_argument (Qinteger_or_char_p, index_); @@ -884,7 +909,7 @@ #endif /* WITH_NUMBER_TYPES */ static EMACS_INT -integer_char_or_marker_to_int (Lisp_Object obj) +fixnum_char_or_marker_to_int (Lisp_Object obj) { retry: if (INTP (obj)) return XINT (obj); @@ -892,6 +917,9 @@ else if (MARKERP (obj)) return marker_position (obj); else { + /* On bignum builds, we can only be called from #'lognot, which + protects against this happening: */ + assert (!BIGNUMP (obj)); obj = wrong_type_argument (Qinteger_char_or_marker_p, obj); goto retry; } @@ -1192,11 +1220,7 @@ */ (number)) { -#ifdef WITH_NUMBER_TYPES CHECK_NUMBER (number); -#else - CHECK_INT_OR_FLOAT (number); -#endif if (FLOATP (number)) { @@ -2132,7 +2156,7 @@ Lisp_Object *args_end = args + nargs; while (args < args_end) - bits &= integer_char_or_marker_to_int (*args++); + bits &= fixnum_char_or_marker_to_int (*args++); return make_int (bits); #endif /* HAVE_BIGNUM */ @@ -2184,7 +2208,7 @@ Lisp_Object *args_end = args + nargs; while (args < args_end) - bits |= integer_char_or_marker_to_int (*args++); + bits |= fixnum_char_or_marker_to_int (*args++); return make_int (bits); #endif /* HAVE_BIGNUM */ @@ -2206,7 +2230,7 @@ return make_int (0); while (!(CHARP (args[0]) || MARKERP (args[0]) || INTEGERP (args[0]))) - args[0] = wrong_type_argument (Qnumber_char_or_marker_p, args[0]); + args[0] = wrong_type_argument (Qinteger_char_or_marker_p, args[0]); result = args[0]; if (CHARP (result)) @@ -2216,7 +2240,7 @@ for (i = 1; i < nargs; i++) { while (!(CHARP (args[i]) || MARKERP (args[i]) || INTEGERP (args[i]))) - args[i] = wrong_type_argument (Qnumber_char_or_marker_p, args[i]); + args[i] = wrong_type_argument (Qinteger_char_or_marker_p, args[i]); other = args[i]; if (promote_args (&result, &other) == FIXNUM_T) { @@ -2235,7 +2259,7 @@ Lisp_Object *args_end = args + nargs; while (args < args_end) - bits ^= integer_char_or_marker_to_int (*args++); + bits ^= fixnum_char_or_marker_to_int (*args++); return make_int (bits); #endif /* !HAVE_BIGNUM */ @@ -2247,6 +2271,9 @@ */ (number)) { + while (!(CHARP (number) || MARKERP (number) || INTEGERP (number))) + number = wrong_type_argument (Qinteger_char_or_marker_p, number); + #ifdef HAVE_BIGNUM if (BIGNUMP (number)) { @@ -2254,7 +2281,8 @@ return make_bignum_bg (scratch_bignum); } #endif /* HAVE_BIGNUM */ - return make_int (~ integer_char_or_marker_to_int (number)); + + return make_int (~ fixnum_char_or_marker_to_int (number)); } DEFUN ("%", Frem, 2, 2, 0, /* @@ -2284,8 +2312,8 @@ return Fcanonicalize_number (make_bignum_bg (scratch_bignum)); } #else /* !HAVE_BIGNUM */ - EMACS_INT ival1 = integer_char_or_marker_to_int (number1); - EMACS_INT ival2 = integer_char_or_marker_to_int (number2); + EMACS_INT ival1 = fixnum_char_or_marker_to_int (number1); + EMACS_INT ival2 = fixnum_char_or_marker_to_int (number2); if (ival2 == 0) Fsignal (Qarith_error, Qnil); @@ -3550,11 +3578,8 @@ DEFSUBR (Fchar_to_int); DEFSUBR (Fint_to_char); DEFSUBR (Fchar_or_char_int_p); -#ifdef HAVE_BIGNUM DEFSUBR (Ffixnump); -#else DEFSUBR (Fintegerp); -#endif DEFSUBR (Finteger_or_marker_p); DEFSUBR (Finteger_or_char_p); DEFSUBR (Finteger_char_or_marker_p); @@ -3644,6 +3669,16 @@ Vall_weak_boxes = Qnil; dump_add_weak_object_chain (&Vall_weak_boxes); + DEFVAR_CONST_INT ("most-negative-fixnum", &Vmost_negative_fixnum /* +The fixnum closest in value to negative infinity. +*/); + Vmost_negative_fixnum = EMACS_INT_MIN; + + DEFVAR_CONST_INT ("most-positive-fixnum", &Vmost_positive_fixnum /* +The fixnum closest in value to positive infinity. +*/); + Vmost_positive_fixnum = EMACS_INT_MAX; + #ifdef DEBUG_XEMACS DEFVAR_BOOL ("debug-issue-ebola-notices", &debug_issue_ebola_notices /* If non-zero, note when your code may be suffering from char-int confoundance.
--- a/src/elhash.c Mon Jan 18 08:44:49 2010 -0600 +++ b/src/elhash.c Fri Jan 29 15:06:36 2010 -0600 @@ -207,13 +207,14 @@ static int lisp_object_eql_equal (Lisp_Object obj1, Lisp_Object obj2) { - return EQ (obj1, obj2) || (FLOATP (obj1) && internal_equal (obj1, obj2, 0)); + return EQ (obj1, obj2) || + (NON_FIXNUM_NUMBER_P (obj1) && internal_equal (obj1, obj2, 0)); } static Hashcode lisp_object_eql_hash (Lisp_Object obj) { - return FLOATP (obj) ? internal_hash (obj, 0) : LISP_HASH (obj); + return NON_FIXNUM_NUMBER_P (obj) ? internal_hash (obj, 0) : LISP_HASH (obj); } static int
--- a/src/faces.c Mon Jan 18 08:44:49 2010 -0600 +++ b/src/faces.c Fri Jan 29 15:06:36 2010 -0600 @@ -2244,7 +2244,7 @@ #endif #ifdef HAVE_X_WINDOWS fg_fb = acons (list1 (Qx), build_string ("black"), fg_fb); - bg_fb = acons (list1 (Qx), build_string ("white"), bg_fb); + bg_fb = acons (list1 (Qx), build_string ("gray80"), bg_fb); #endif #ifdef HAVE_TTY fg_fb = acons (list1 (Qtty), Fvector (0, 0), fg_fb);
--- a/src/floatfns.c Mon Jan 18 08:44:49 2010 -0600 +++ b/src/floatfns.c Fri Jan 29 15:06:36 2010 -0600 @@ -26,7 +26,6 @@ Define HAVE_INVERSE_HYPERBOLIC if you have acosh, asinh, and atanh. Define HAVE_CBRT if you have cbrt(). - Define HAVE_RINT if you have rint(). If you don't define these, then the appropriate routines will be simulated. Define HAVE_MATHERR if on a system supporting the SysV matherr() callback. @@ -50,11 +49,8 @@ #include "syssignal.h" #include "sysfloat.h" -/* The code uses emacs_rint, so that it works to undefine HAVE_RINT - if `rint' exists but does not work right. */ -#ifdef HAVE_RINT -#define emacs_rint rint -#else +/* An implementation of rint that always rounds towards the even number in + the case of ambiguity. */ static double emacs_rint (double x) { @@ -65,7 +61,6 @@ r += r < x ? 1.0 : -1.0; return r; } -#endif /* Nonzero while executing in floating point. This tells float_error what to do. */
--- a/src/lisp.h Mon Jan 18 08:44:49 2010 -0600 +++ b/src/lisp.h Fri Jan 29 15:06:36 2010 -0600 @@ -4195,11 +4195,7 @@ /************************************************************************/ /* Other numeric types */ /************************************************************************/ -#ifdef WITH_NUMBER_TYPES #include "number.h" -#else -#define make_integer(x) make_int(x) -#endif /************************************************************************/
--- a/src/number.c Mon Jan 18 08:44:49 2010 -0600 +++ b/src/number.c Fri Jan 29 15:06:36 2010 -0600 @@ -32,7 +32,7 @@ Lisp_Object Qrationalp, Qfloatingp, Qrealp; Lisp_Object Vdefault_float_precision; -Fixnum Vmost_negative_fixnum, Vmost_positive_fixnum; + static Lisp_Object Qunsupported_type; static Lisp_Object Vbigfloat_max_prec; static int number_initialized; @@ -139,38 +139,6 @@ } -/********************************* Integers *********************************/ -DEFUN ("integerp", Fintegerp, 1, 1, 0, /* -Return t if OBJECT is an integer, nil otherwise. -*/ - (object)) -{ - return INTEGERP (object) ? Qt : Qnil; -} - -DEFUN ("evenp", Fevenp, 1, 1, 0, /* -Return t if INTEGER is even, nil otherwise. -*/ - (integer)) -{ - CONCHECK_INTEGER (integer); - return (BIGNUMP (integer) - ? bignum_evenp (XBIGNUM_DATA (integer)) - : XTYPE (integer) == Lisp_Type_Int_Even) ? Qt : Qnil; -} - -DEFUN ("oddp", Foddp, 1, 1, 0, /* -Return t if INTEGER is odd, nil otherwise. -*/ - (integer)) -{ - CONCHECK_INTEGER (integer); - return (BIGNUMP (integer) - ? bignum_oddp (XBIGNUM_DATA (integer)) - : XTYPE (integer) == Lisp_Type_Int_Odd) ? Qt : Qnil; -} - - /********************************** Ratios **********************************/ #ifdef HAVE_RATIO static void @@ -248,12 +216,13 @@ { CONCHECK_RATIONAL (rational); #ifdef HAVE_RATIO - return RATIOP (rational) - ? make_bignum_bg (XRATIO_NUMERATOR (rational)) - : rational; -#else + if (RATIOP (rational)) + { + return + Fcanonicalize_number (make_bignum_bg (XRATIO_NUMERATOR (rational))); + } +#endif return rational; -#endif } DEFUN ("denominator", Fdenominator, 1, 1, 0, /* @@ -264,12 +233,13 @@ { CONCHECK_RATIONAL (rational); #ifdef HAVE_RATIO - return RATIOP (rational) - ? make_bignum_bg (XRATIO_DENOMINATOR (rational)) - : make_int (1); -#else - return rational; + if (RATIOP (rational)) + { + return Fcanonicalize_number (make_bignum_bg + (XRATIO_DENOMINATOR (rational))); + } #endif + return make_int (1); } @@ -451,7 +421,7 @@ if (RATIOP (number) && bignum_fits_long_p (XRATIO_DENOMINATOR (number)) && bignum_to_long (XRATIO_DENOMINATOR (number)) == 1L) - number = make_bignum_bg (XRATIO_NUMERATOR (number)); + number = Fcanonicalize_number (make_bignum_bg (XRATIO_NUMERATOR (number))); #endif #ifdef HAVE_BIGNUM if (BIGNUMP (number) && bignum_fits_emacs_int_p (XBIGNUM_DATA (number))) @@ -808,9 +778,6 @@ /* Functions */ DEFSUBR (Fbignump); - DEFSUBR (Fintegerp); - DEFSUBR (Fevenp); - DEFSUBR (Foddp); DEFSUBR (Fratiop); DEFSUBR (Frationalp); DEFSUBR (Fnumerator); @@ -853,16 +820,6 @@ Vbigfloat_max_prec = make_int (0); #endif /* HAVE_BIGFLOAT */ - DEFVAR_CONST_INT ("most-negative-fixnum", &Vmost_negative_fixnum /* -The fixnum closest in value to negative infinity. -*/); - Vmost_negative_fixnum = EMACS_INT_MIN; - - DEFVAR_CONST_INT ("most-positive-fixnum", &Vmost_positive_fixnum /* -The fixnum closest in value to positive infinity. -*/); - Vmost_positive_fixnum = EMACS_INT_MAX; - Fprovide (intern ("number-types")); #ifdef HAVE_BIGNUM Fprovide (intern ("bignum"));
--- a/src/number.h Mon Jan 18 08:44:49 2010 -0600 +++ b/src/number.h Fri Jan 29 15:06:36 2010 -0600 @@ -338,4 +338,35 @@ extern enum number_type get_number_type (Lisp_Object); extern enum number_type promote_args (Lisp_Object *, Lisp_Object *); +#ifdef WITH_NUMBER_TYPES +DECLARE_INLINE_HEADER ( +int +non_fixnum_number_p (Lisp_Object object)) +{ + if (LRECORDP (object)) + { + switch (XRECORD_LHEADER (object)->type) + { + case lrecord_type_float: +#ifdef HAVE_BIGNUM + case lrecord_type_bignum: +#endif +#ifdef HAVE_RATIO + case lrecord_type_ratio: +#endif +#ifdef HAVE_BIGFLOAT + case lrecord_type_bigfloat: +#endif + return 1; + } + } + return 0; +} +#define NON_FIXNUM_NUMBER_P(X) non_fixnum_number_p (X) + +#else +#define NON_FIXNUM_NUMBER_P FLOATP +#endif + + #endif /* INCLUDED_number_h_ */
--- a/src/sysfile.h Mon Jan 18 08:44:49 2010 -0600 +++ b/src/sysfile.h Fri Jan 29 15:06:36 2010 -0600 @@ -38,6 +38,11 @@ # include <sys/errno.h> /* <errno.h> does not always imply this */ #endif +/* EOVERFLOW isn't defined on native Windows under VC6 */ +#ifndef EOVERFLOW +# define EOVERFLOW 10139 +#endif + #ifdef HAVE_UNISTD_H # include <unistd.h> #endif
--- a/src/syswindows.h Mon Jan 18 08:44:49 2010 -0600 +++ b/src/syswindows.h Fri Jan 29 15:06:36 2010 -0600 @@ -473,8 +473,16 @@ typedef LPCDLGTEMPLATE LPCDLGTEMPLATEA; #else /* !CYGWIN_HEADERS */ + #define W32API_VER(major,minor) 0 #define W32API_INSTALLED_VER 0 + +/* Some types that show up in Cygwin headers but not in Visual Studio headers, + and cause problems if we used Cygwin headers to generate + intl-auto-encap-win32.[ch]. */ +typedef LPCVOID PCVOID; +typedef LPDWORD *PDWORD_PTR; + #endif /* CYGWIN_HEADERS */ /* Not in VC 6 */
--- a/tests/ChangeLog Mon Jan 18 08:44:49 2010 -0600 +++ b/tests/ChangeLog Fri Jan 29 15:06:36 2010 -0600 @@ -1,3 +1,28 @@ +2010-01-27 Ben Wing <ben@xemacs.org> + + * automated/test-harness.el (test-harness-from-buffer): + Update doc string of `Assert-test' and change the failing-case + message to be clearer. Also add `Assert-test-not' for asserting + that a comparison should fail. + +2010-01-27 Ben Wing <ben@xemacs.org> + + * automated/case-tests.el: + * automated/case-tests.el (char-as-unicode-escape): New. + Add a "torture test" that uses the full set of lower-upper case + mappings from Unicode. See whether strings composed of all + lower-case characters across all languages will correctly be + uppercased to the string equivalent to all uppercase characters, + and vice-versa, and whether you can correctly do a case-folding + search in a buffer for these characters, all at once or individually. + Result: a number of assertion failures. + +2010-01-26 Aidan Kehoe <kehoea@parhasard.net> + + * automated/mule-tests.el: + Only give the list of character sets in HELLO once; correct it to + reflect its current contents and the extant character sets. + 2010-01-14 Ben Wing <ben@xemacs.org> * automated/mule-tests.el (featurep):
--- a/tests/automated/case-tests.el Mon Jan 18 08:44:49 2010 -0600 +++ b/tests/automated/case-tests.el Fri Jan 29 15:06:36 2010 -0600 @@ -1,6 +1,7 @@ ;;; -*- coding: iso-8859-1 -*- ;; Copyright (C) 2000 Free Software Foundation, Inc. +;; Copyright (C) 2010 Ben Wing. ;; Author: Yoshiki Hayashi <yoshiki@xemacs.org> ;; Maintainer: Yoshiki Hayashi <yoshiki@xemacs.org> @@ -331,3 +332,1331 @@ (make-char 'latin-iso8859-9 #xfd)))) (Assert-eq 'simple-search search-algorithm-used))))) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +;; Torture test, using all the non-"full" mappings from the Unicode case +;; tables. (Full mappings are those that involve sequences of more than one +;; character, e.g. lowercase German ß (esszet) -> uppercase sequence "SS"). + +(defun char-as-unicode-escape (ch) + "Return a string corresponding to the Unicode read-expression of CH. +For example, if CH is ?\\u00F1, the return value will be the string +\"?\\\\u00F1\"." + (let ((uni (char-to-unicode ch))) + (if (< uni #x10000) (format "?\\u%04X" uni) (format "?\\U%08X" uni)))) + +(let* ((uni-mappings + '(; UPPER LOWER + (?\u0041 ?\u0061) ;; LATIN CAPITAL LETTER A + (?\u0042 ?\u0062) ;; LATIN CAPITAL LETTER B + (?\u0043 ?\u0063) ;; LATIN CAPITAL LETTER C + (?\u0044 ?\u0064) ;; LATIN CAPITAL LETTER D + (?\u0045 ?\u0065) ;; LATIN CAPITAL LETTER E + (?\u0046 ?\u0066) ;; LATIN CAPITAL LETTER F + (?\u0047 ?\u0067) ;; LATIN CAPITAL LETTER G + (?\u0048 ?\u0068) ;; LATIN CAPITAL LETTER H + (?\u0049 ?\u0069) ;; LATIN CAPITAL LETTER I +;;; WARNING: Unhandled Turkish mapping: +;;; 0049; T; 0131; # LATIN CAPITAL LETTER I + (?\u004A ?\u006A) ;; LATIN CAPITAL LETTER J + (?\u004B ?\u006B) ;; LATIN CAPITAL LETTER K + (?\u004C ?\u006C) ;; LATIN CAPITAL LETTER L + (?\u004D ?\u006D) ;; LATIN CAPITAL LETTER M + (?\u004E ?\u006E) ;; LATIN CAPITAL LETTER N + (?\u004F ?\u006F) ;; LATIN CAPITAL LETTER O + (?\u0050 ?\u0070) ;; LATIN CAPITAL LETTER P + (?\u0051 ?\u0071) ;; LATIN CAPITAL LETTER Q + (?\u0052 ?\u0072) ;; LATIN CAPITAL LETTER R + (?\u0053 ?\u0073) ;; LATIN CAPITAL LETTER S + (?\u0054 ?\u0074) ;; LATIN CAPITAL LETTER T + (?\u0055 ?\u0075) ;; LATIN CAPITAL LETTER U + (?\u0056 ?\u0076) ;; LATIN CAPITAL LETTER V + (?\u0057 ?\u0077) ;; LATIN CAPITAL LETTER W + (?\u0058 ?\u0078) ;; LATIN CAPITAL LETTER X + (?\u0059 ?\u0079) ;; LATIN CAPITAL LETTER Y + (?\u005A ?\u007A) ;; LATIN CAPITAL LETTER Z + (?\u00B5 ?\u03BC) ;; MICRO SIGN + (?\u00C0 ?\u00E0) ;; LATIN CAPITAL LETTER A WITH GRAVE + (?\u00C1 ?\u00E1) ;; LATIN CAPITAL LETTER A WITH ACUTE + (?\u00C2 ?\u00E2) ;; LATIN CAPITAL LETTER A WITH CIRCUMFLEX + (?\u00C3 ?\u00E3) ;; LATIN CAPITAL LETTER A WITH TILDE + (?\u00C4 ?\u00E4) ;; LATIN CAPITAL LETTER A WITH DIAERESIS + (?\u00C5 ?\u00E5) ;; LATIN CAPITAL LETTER A WITH RING ABOVE + (?\u00C6 ?\u00E6) ;; LATIN CAPITAL LETTER AE + (?\u00C7 ?\u00E7) ;; LATIN CAPITAL LETTER C WITH CEDILLA + (?\u00C8 ?\u00E8) ;; LATIN CAPITAL LETTER E WITH GRAVE + (?\u00C9 ?\u00E9) ;; LATIN CAPITAL LETTER E WITH ACUTE + (?\u00CA ?\u00EA) ;; LATIN CAPITAL LETTER E WITH CIRCUMFLEX + (?\u00CB ?\u00EB) ;; LATIN CAPITAL LETTER E WITH DIAERESIS + (?\u00CC ?\u00EC) ;; LATIN CAPITAL LETTER I WITH GRAVE + (?\u00CD ?\u00ED) ;; LATIN CAPITAL LETTER I WITH ACUTE + (?\u00CE ?\u00EE) ;; LATIN CAPITAL LETTER I WITH CIRCUMFLEX + (?\u00CF ?\u00EF) ;; LATIN CAPITAL LETTER I WITH DIAERESIS + (?\u00D0 ?\u00F0) ;; LATIN CAPITAL LETTER ETH + (?\u00D1 ?\u00F1) ;; LATIN CAPITAL LETTER N WITH TILDE + (?\u00D2 ?\u00F2) ;; LATIN CAPITAL LETTER O WITH GRAVE + (?\u00D3 ?\u00F3) ;; LATIN CAPITAL LETTER O WITH ACUTE + (?\u00D4 ?\u00F4) ;; LATIN CAPITAL LETTER O WITH CIRCUMFLEX + (?\u00D5 ?\u00F5) ;; LATIN CAPITAL LETTER O WITH TILDE + (?\u00D6 ?\u00F6) ;; LATIN CAPITAL LETTER O WITH DIAERESIS + (?\u00D8 ?\u00F8) ;; LATIN CAPITAL LETTER O WITH STROKE + (?\u00D9 ?\u00F9) ;; LATIN CAPITAL LETTER U WITH GRAVE + (?\u00DA ?\u00FA) ;; LATIN CAPITAL LETTER U WITH ACUTE + (?\u00DB ?\u00FB) ;; LATIN CAPITAL LETTER U WITH CIRCUMFLEX + (?\u00DC ?\u00FC) ;; LATIN CAPITAL LETTER U WITH DIAERESIS + (?\u00DD ?\u00FD) ;; LATIN CAPITAL LETTER Y WITH ACUTE + (?\u00DE ?\u00FE) ;; LATIN CAPITAL LETTER THORN +;;; WARNING: Unhandled full mapping: +;;; 00DF; F; 0073 0073; # LATIN SMALL LETTER SHARP S + (?\u0100 ?\u0101) ;; LATIN CAPITAL LETTER A WITH MACRON + (?\u0102 ?\u0103) ;; LATIN CAPITAL LETTER A WITH BREVE + (?\u0104 ?\u0105) ;; LATIN CAPITAL LETTER A WITH OGONEK + (?\u0106 ?\u0107) ;; LATIN CAPITAL LETTER C WITH ACUTE + (?\u0108 ?\u0109) ;; LATIN CAPITAL LETTER C WITH CIRCUMFLEX + (?\u010A ?\u010B) ;; LATIN CAPITAL LETTER C WITH DOT ABOVE + (?\u010C ?\u010D) ;; LATIN CAPITAL LETTER C WITH CARON + (?\u010E ?\u010F) ;; LATIN CAPITAL LETTER D WITH CARON + (?\u0110 ?\u0111) ;; LATIN CAPITAL LETTER D WITH STROKE + (?\u0112 ?\u0113) ;; LATIN CAPITAL LETTER E WITH MACRON + (?\u0114 ?\u0115) ;; LATIN CAPITAL LETTER E WITH BREVE + (?\u0116 ?\u0117) ;; LATIN CAPITAL LETTER E WITH DOT ABOVE + (?\u0118 ?\u0119) ;; LATIN CAPITAL LETTER E WITH OGONEK + (?\u011A ?\u011B) ;; LATIN CAPITAL LETTER E WITH CARON + (?\u011C ?\u011D) ;; LATIN CAPITAL LETTER G WITH CIRCUMFLEX + (?\u011E ?\u011F) ;; LATIN CAPITAL LETTER G WITH BREVE + (?\u0120 ?\u0121) ;; LATIN CAPITAL LETTER G WITH DOT ABOVE + (?\u0122 ?\u0123) ;; LATIN CAPITAL LETTER G WITH CEDILLA + (?\u0124 ?\u0125) ;; LATIN CAPITAL LETTER H WITH CIRCUMFLEX + (?\u0126 ?\u0127) ;; LATIN CAPITAL LETTER H WITH STROKE + (?\u0128 ?\u0129) ;; LATIN CAPITAL LETTER I WITH TILDE + (?\u012A ?\u012B) ;; LATIN CAPITAL LETTER I WITH MACRON + (?\u012C ?\u012D) ;; LATIN CAPITAL LETTER I WITH BREVE + (?\u012E ?\u012F) ;; LATIN CAPITAL LETTER I WITH OGONEK +;;; WARNING: Unhandled full mapping: +;;; 0130; F; 0069 0307; # LATIN CAPITAL LETTER I WITH DOT ABOVE +;;; WARNING: Unhandled Turkish mapping: +;;; 0130; T; 0069; # LATIN CAPITAL LETTER I WITH DOT ABOVE + (?\u0132 ?\u0133) ;; LATIN CAPITAL LIGATURE IJ + (?\u0134 ?\u0135) ;; LATIN CAPITAL LETTER J WITH CIRCUMFLEX + (?\u0136 ?\u0137) ;; LATIN CAPITAL LETTER K WITH CEDILLA + (?\u0139 ?\u013A) ;; LATIN CAPITAL LETTER L WITH ACUTE + (?\u013B ?\u013C) ;; LATIN CAPITAL LETTER L WITH CEDILLA + (?\u013D ?\u013E) ;; LATIN CAPITAL LETTER L WITH CARON + (?\u013F ?\u0140) ;; LATIN CAPITAL LETTER L WITH MIDDLE DOT + (?\u0141 ?\u0142) ;; LATIN CAPITAL LETTER L WITH STROKE + (?\u0143 ?\u0144) ;; LATIN CAPITAL LETTER N WITH ACUTE + (?\u0145 ?\u0146) ;; LATIN CAPITAL LETTER N WITH CEDILLA + (?\u0147 ?\u0148) ;; LATIN CAPITAL LETTER N WITH CARON +;;; WARNING: Unhandled full mapping: +;;; 0149; F; 02BC 006E; # LATIN SMALL LETTER N PRECEDED BY APOSTROPHE + (?\u014A ?\u014B) ;; LATIN CAPITAL LETTER ENG + (?\u014C ?\u014D) ;; LATIN CAPITAL LETTER O WITH MACRON + (?\u014E ?\u014F) ;; LATIN CAPITAL LETTER O WITH BREVE + (?\u0150 ?\u0151) ;; LATIN CAPITAL LETTER O WITH DOUBLE ACUTE + (?\u0152 ?\u0153) ;; LATIN CAPITAL LIGATURE OE + (?\u0154 ?\u0155) ;; LATIN CAPITAL LETTER R WITH ACUTE + (?\u0156 ?\u0157) ;; LATIN CAPITAL LETTER R WITH CEDILLA + (?\u0158 ?\u0159) ;; LATIN CAPITAL LETTER R WITH CARON + (?\u015A ?\u015B) ;; LATIN CAPITAL LETTER S WITH ACUTE + (?\u015C ?\u015D) ;; LATIN CAPITAL LETTER S WITH CIRCUMFLEX + (?\u015E ?\u015F) ;; LATIN CAPITAL LETTER S WITH CEDILLA + (?\u0160 ?\u0161) ;; LATIN CAPITAL LETTER S WITH CARON + (?\u0162 ?\u0163) ;; LATIN CAPITAL LETTER T WITH CEDILLA + (?\u0164 ?\u0165) ;; LATIN CAPITAL LETTER T WITH CARON + (?\u0166 ?\u0167) ;; LATIN CAPITAL LETTER T WITH STROKE + (?\u0168 ?\u0169) ;; LATIN CAPITAL LETTER U WITH TILDE + (?\u016A ?\u016B) ;; LATIN CAPITAL LETTER U WITH MACRON + (?\u016C ?\u016D) ;; LATIN CAPITAL LETTER U WITH BREVE + (?\u016E ?\u016F) ;; LATIN CAPITAL LETTER U WITH RING ABOVE + (?\u0170 ?\u0171) ;; LATIN CAPITAL LETTER U WITH DOUBLE ACUTE + (?\u0172 ?\u0173) ;; LATIN CAPITAL LETTER U WITH OGONEK + (?\u0174 ?\u0175) ;; LATIN CAPITAL LETTER W WITH CIRCUMFLEX + (?\u0176 ?\u0177) ;; LATIN CAPITAL LETTER Y WITH CIRCUMFLEX + (?\u0178 ?\u00FF) ;; LATIN CAPITAL LETTER Y WITH DIAERESIS + (?\u0179 ?\u017A) ;; LATIN CAPITAL LETTER Z WITH ACUTE + (?\u017B ?\u017C) ;; LATIN CAPITAL LETTER Z WITH DOT ABOVE + (?\u017D ?\u017E) ;; LATIN CAPITAL LETTER Z WITH CARON + (?\u017F ?\u0073) ;; LATIN SMALL LETTER LONG S + (?\u0181 ?\u0253) ;; LATIN CAPITAL LETTER B WITH HOOK + (?\u0182 ?\u0183) ;; LATIN CAPITAL LETTER B WITH TOPBAR + (?\u0184 ?\u0185) ;; LATIN CAPITAL LETTER TONE SIX + (?\u0186 ?\u0254) ;; LATIN CAPITAL LETTER OPEN O + (?\u0187 ?\u0188) ;; LATIN CAPITAL LETTER C WITH HOOK + (?\u0189 ?\u0256) ;; LATIN CAPITAL LETTER AFRICAN D + (?\u018A ?\u0257) ;; LATIN CAPITAL LETTER D WITH HOOK + (?\u018B ?\u018C) ;; LATIN CAPITAL LETTER D WITH TOPBAR + (?\u018E ?\u01DD) ;; LATIN CAPITAL LETTER REVERSED E + (?\u018F ?\u0259) ;; LATIN CAPITAL LETTER SCHWA + (?\u0190 ?\u025B) ;; LATIN CAPITAL LETTER OPEN E + (?\u0191 ?\u0192) ;; LATIN CAPITAL LETTER F WITH HOOK + (?\u0193 ?\u0260) ;; LATIN CAPITAL LETTER G WITH HOOK + (?\u0194 ?\u0263) ;; LATIN CAPITAL LETTER GAMMA + (?\u0196 ?\u0269) ;; LATIN CAPITAL LETTER IOTA + (?\u0197 ?\u0268) ;; LATIN CAPITAL LETTER I WITH STROKE + (?\u0198 ?\u0199) ;; LATIN CAPITAL LETTER K WITH HOOK + (?\u019C ?\u026F) ;; LATIN CAPITAL LETTER TURNED M + (?\u019D ?\u0272) ;; LATIN CAPITAL LETTER N WITH LEFT HOOK + (?\u019F ?\u0275) ;; LATIN CAPITAL LETTER O WITH MIDDLE TILDE + (?\u01A0 ?\u01A1) ;; LATIN CAPITAL LETTER O WITH HORN + (?\u01A2 ?\u01A3) ;; LATIN CAPITAL LETTER OI + (?\u01A4 ?\u01A5) ;; LATIN CAPITAL LETTER P WITH HOOK + (?\u01A6 ?\u0280) ;; LATIN LETTER YR + (?\u01A7 ?\u01A8) ;; LATIN CAPITAL LETTER TONE TWO + (?\u01A9 ?\u0283) ;; LATIN CAPITAL LETTER ESH + (?\u01AC ?\u01AD) ;; LATIN CAPITAL LETTER T WITH HOOK + (?\u01AE ?\u0288) ;; LATIN CAPITAL LETTER T WITH RETROFLEX HOOK + (?\u01AF ?\u01B0) ;; LATIN CAPITAL LETTER U WITH HORN + (?\u01B1 ?\u028A) ;; LATIN CAPITAL LETTER UPSILON + (?\u01B2 ?\u028B) ;; LATIN CAPITAL LETTER V WITH HOOK + (?\u01B3 ?\u01B4) ;; LATIN CAPITAL LETTER Y WITH HOOK + (?\u01B5 ?\u01B6) ;; LATIN CAPITAL LETTER Z WITH STROKE + (?\u01B7 ?\u0292) ;; LATIN CAPITAL LETTER EZH + (?\u01B8 ?\u01B9) ;; LATIN CAPITAL LETTER EZH REVERSED + (?\u01BC ?\u01BD) ;; LATIN CAPITAL LETTER TONE FIVE + (?\u01C4 ?\u01C6) ;; LATIN CAPITAL LETTER DZ WITH CARON + (?\u01C5 ?\u01C6) ;; LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON + (?\u01C7 ?\u01C9) ;; LATIN CAPITAL LETTER LJ + (?\u01C8 ?\u01C9) ;; LATIN CAPITAL LETTER L WITH SMALL LETTER J + (?\u01CA ?\u01CC) ;; LATIN CAPITAL LETTER NJ + (?\u01CB ?\u01CC) ;; LATIN CAPITAL LETTER N WITH SMALL LETTER J + (?\u01CD ?\u01CE) ;; LATIN CAPITAL LETTER A WITH CARON + (?\u01CF ?\u01D0) ;; LATIN CAPITAL LETTER I WITH CARON + (?\u01D1 ?\u01D2) ;; LATIN CAPITAL LETTER O WITH CARON + (?\u01D3 ?\u01D4) ;; LATIN CAPITAL LETTER U WITH CARON + (?\u01D5 ?\u01D6) ;; LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON + (?\u01D7 ?\u01D8) ;; LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE + (?\u01D9 ?\u01DA) ;; LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON + (?\u01DB ?\u01DC) ;; LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE + (?\u01DE ?\u01DF) ;; LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON + (?\u01E0 ?\u01E1) ;; LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON + (?\u01E2 ?\u01E3) ;; LATIN CAPITAL LETTER AE WITH MACRON + (?\u01E4 ?\u01E5) ;; LATIN CAPITAL LETTER G WITH STROKE + (?\u01E6 ?\u01E7) ;; LATIN CAPITAL LETTER G WITH CARON + (?\u01E8 ?\u01E9) ;; LATIN CAPITAL LETTER K WITH CARON + (?\u01EA ?\u01EB) ;; LATIN CAPITAL LETTER O WITH OGONEK + (?\u01EC ?\u01ED) ;; LATIN CAPITAL LETTER O WITH OGONEK AND MACRON + (?\u01EE ?\u01EF) ;; LATIN CAPITAL LETTER EZH WITH CARON +;;; WARNING: Unhandled full mapping: +;;; 01F0; F; 006A 030C; # LATIN SMALL LETTER J WITH CARON + (?\u01F1 ?\u01F3) ;; LATIN CAPITAL LETTER DZ + (?\u01F2 ?\u01F3) ;; LATIN CAPITAL LETTER D WITH SMALL LETTER Z + (?\u01F4 ?\u01F5) ;; LATIN CAPITAL LETTER G WITH ACUTE + (?\u01F6 ?\u0195) ;; LATIN CAPITAL LETTER HWAIR + (?\u01F7 ?\u01BF) ;; LATIN CAPITAL LETTER WYNN + (?\u01F8 ?\u01F9) ;; LATIN CAPITAL LETTER N WITH GRAVE + (?\u01FA ?\u01FB) ;; LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE + (?\u01FC ?\u01FD) ;; LATIN CAPITAL LETTER AE WITH ACUTE + (?\u01FE ?\u01FF) ;; LATIN CAPITAL LETTER O WITH STROKE AND ACUTE + (?\u0200 ?\u0201) ;; LATIN CAPITAL LETTER A WITH DOUBLE GRAVE + (?\u0202 ?\u0203) ;; LATIN CAPITAL LETTER A WITH INVERTED BREVE + (?\u0204 ?\u0205) ;; LATIN CAPITAL LETTER E WITH DOUBLE GRAVE + (?\u0206 ?\u0207) ;; LATIN CAPITAL LETTER E WITH INVERTED BREVE + (?\u0208 ?\u0209) ;; LATIN CAPITAL LETTER I WITH DOUBLE GRAVE + (?\u020A ?\u020B) ;; LATIN CAPITAL LETTER I WITH INVERTED BREVE + (?\u020C ?\u020D) ;; LATIN CAPITAL LETTER O WITH DOUBLE GRAVE + (?\u020E ?\u020F) ;; LATIN CAPITAL LETTER O WITH INVERTED BREVE + (?\u0210 ?\u0211) ;; LATIN CAPITAL LETTER R WITH DOUBLE GRAVE + (?\u0212 ?\u0213) ;; LATIN CAPITAL LETTER R WITH INVERTED BREVE + (?\u0214 ?\u0215) ;; LATIN CAPITAL LETTER U WITH DOUBLE GRAVE + (?\u0216 ?\u0217) ;; LATIN CAPITAL LETTER U WITH INVERTED BREVE + (?\u0218 ?\u0219) ;; LATIN CAPITAL LETTER S WITH COMMA BELOW + (?\u021A ?\u021B) ;; LATIN CAPITAL LETTER T WITH COMMA BELOW + (?\u021C ?\u021D) ;; LATIN CAPITAL LETTER YOGH + (?\u021E ?\u021F) ;; LATIN CAPITAL LETTER H WITH CARON + (?\u0220 ?\u019E) ;; LATIN CAPITAL LETTER N WITH LONG RIGHT LEG + (?\u0222 ?\u0223) ;; LATIN CAPITAL LETTER OU + (?\u0224 ?\u0225) ;; LATIN CAPITAL LETTER Z WITH HOOK + (?\u0226 ?\u0227) ;; LATIN CAPITAL LETTER A WITH DOT ABOVE + (?\u0228 ?\u0229) ;; LATIN CAPITAL LETTER E WITH CEDILLA + (?\u022A ?\u022B) ;; LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON + (?\u022C ?\u022D) ;; LATIN CAPITAL LETTER O WITH TILDE AND MACRON + (?\u022E ?\u022F) ;; LATIN CAPITAL LETTER O WITH DOT ABOVE + (?\u0230 ?\u0231) ;; LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON + (?\u0232 ?\u0233) ;; LATIN CAPITAL LETTER Y WITH MACRON + (?\u023A ?\u2C65) ;; LATIN CAPITAL LETTER A WITH STROKE + (?\u023B ?\u023C) ;; LATIN CAPITAL LETTER C WITH STROKE + (?\u023D ?\u019A) ;; LATIN CAPITAL LETTER L WITH BAR + (?\u023E ?\u2C66) ;; LATIN CAPITAL LETTER T WITH DIAGONAL STROKE + (?\u0241 ?\u0242) ;; LATIN CAPITAL LETTER GLOTTAL STOP + (?\u0243 ?\u0180) ;; LATIN CAPITAL LETTER B WITH STROKE + (?\u0244 ?\u0289) ;; LATIN CAPITAL LETTER U BAR + (?\u0245 ?\u028C) ;; LATIN CAPITAL LETTER TURNED V + (?\u0246 ?\u0247) ;; LATIN CAPITAL LETTER E WITH STROKE + (?\u0248 ?\u0249) ;; LATIN CAPITAL LETTER J WITH STROKE + (?\u024A ?\u024B) ;; LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL + (?\u024C ?\u024D) ;; LATIN CAPITAL LETTER R WITH STROKE + (?\u024E ?\u024F) ;; LATIN CAPITAL LETTER Y WITH STROKE + (?\u0345 ?\u03B9) ;; COMBINING GREEK YPOGEGRAMMENI + (?\u0370 ?\u0371) ;; GREEK CAPITAL LETTER HETA + (?\u0372 ?\u0373) ;; GREEK CAPITAL LETTER ARCHAIC SAMPI + (?\u0376 ?\u0377) ;; GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA + (?\u0386 ?\u03AC) ;; GREEK CAPITAL LETTER ALPHA WITH TONOS + (?\u0388 ?\u03AD) ;; GREEK CAPITAL LETTER EPSILON WITH TONOS + (?\u0389 ?\u03AE) ;; GREEK CAPITAL LETTER ETA WITH TONOS + (?\u038A ?\u03AF) ;; GREEK CAPITAL LETTER IOTA WITH TONOS + (?\u038C ?\u03CC) ;; GREEK CAPITAL LETTER OMICRON WITH TONOS + (?\u038E ?\u03CD) ;; GREEK CAPITAL LETTER UPSILON WITH TONOS + (?\u038F ?\u03CE) ;; GREEK CAPITAL LETTER OMEGA WITH TONOS +;;; WARNING: Unhandled full mapping: +;;; 0390; F; 03B9 0308 0301; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS + (?\u0391 ?\u03B1) ;; GREEK CAPITAL LETTER ALPHA + (?\u0392 ?\u03B2) ;; GREEK CAPITAL LETTER BETA + (?\u0393 ?\u03B3) ;; GREEK CAPITAL LETTER GAMMA + (?\u0394 ?\u03B4) ;; GREEK CAPITAL LETTER DELTA + (?\u0395 ?\u03B5) ;; GREEK CAPITAL LETTER EPSILON + (?\u0396 ?\u03B6) ;; GREEK CAPITAL LETTER ZETA + (?\u0397 ?\u03B7) ;; GREEK CAPITAL LETTER ETA + (?\u0398 ?\u03B8) ;; GREEK CAPITAL LETTER THETA + (?\u0399 ?\u03B9) ;; GREEK CAPITAL LETTER IOTA + (?\u039A ?\u03BA) ;; GREEK CAPITAL LETTER KAPPA + (?\u039B ?\u03BB) ;; GREEK CAPITAL LETTER LAMDA + (?\u039C ?\u03BC) ;; GREEK CAPITAL LETTER MU + (?\u039D ?\u03BD) ;; GREEK CAPITAL LETTER NU + (?\u039E ?\u03BE) ;; GREEK CAPITAL LETTER XI + (?\u039F ?\u03BF) ;; GREEK CAPITAL LETTER OMICRON + (?\u03A0 ?\u03C0) ;; GREEK CAPITAL LETTER PI + (?\u03A1 ?\u03C1) ;; GREEK CAPITAL LETTER RHO + (?\u03A3 ?\u03C3) ;; GREEK CAPITAL LETTER SIGMA + (?\u03A4 ?\u03C4) ;; GREEK CAPITAL LETTER TAU + (?\u03A5 ?\u03C5) ;; GREEK CAPITAL LETTER UPSILON + (?\u03A6 ?\u03C6) ;; GREEK CAPITAL LETTER PHI + (?\u03A7 ?\u03C7) ;; GREEK CAPITAL LETTER CHI + (?\u03A8 ?\u03C8) ;; GREEK CAPITAL LETTER PSI + (?\u03A9 ?\u03C9) ;; GREEK CAPITAL LETTER OMEGA + (?\u03AA ?\u03CA) ;; GREEK CAPITAL LETTER IOTA WITH DIALYTIKA + (?\u03AB ?\u03CB) ;; GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA +;;; WARNING: Unhandled full mapping: +;;; 03B0; F; 03C5 0308 0301; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS + (?\u03C2 ?\u03C3) ;; GREEK SMALL LETTER FINAL SIGMA + (?\u03CF ?\u03D7) ;; GREEK CAPITAL KAI SYMBOL + (?\u03D0 ?\u03B2) ;; GREEK BETA SYMBOL + (?\u03D1 ?\u03B8) ;; GREEK THETA SYMBOL + (?\u03D5 ?\u03C6) ;; GREEK PHI SYMBOL + (?\u03D6 ?\u03C0) ;; GREEK PI SYMBOL + (?\u03D8 ?\u03D9) ;; GREEK LETTER ARCHAIC KOPPA + (?\u03DA ?\u03DB) ;; GREEK LETTER STIGMA + (?\u03DC ?\u03DD) ;; GREEK LETTER DIGAMMA + (?\u03DE ?\u03DF) ;; GREEK LETTER KOPPA + (?\u03E0 ?\u03E1) ;; GREEK LETTER SAMPI + (?\u03E2 ?\u03E3) ;; COPTIC CAPITAL LETTER SHEI + (?\u03E4 ?\u03E5) ;; COPTIC CAPITAL LETTER FEI + (?\u03E6 ?\u03E7) ;; COPTIC CAPITAL LETTER KHEI + (?\u03E8 ?\u03E9) ;; COPTIC CAPITAL LETTER HORI + (?\u03EA ?\u03EB) ;; COPTIC CAPITAL LETTER GANGIA + (?\u03EC ?\u03ED) ;; COPTIC CAPITAL LETTER SHIMA + (?\u03EE ?\u03EF) ;; COPTIC CAPITAL LETTER DEI + (?\u03F0 ?\u03BA) ;; GREEK KAPPA SYMBOL + (?\u03F1 ?\u03C1) ;; GREEK RHO SYMBOL + (?\u03F4 ?\u03B8) ;; GREEK CAPITAL THETA SYMBOL + (?\u03F5 ?\u03B5) ;; GREEK LUNATE EPSILON SYMBOL + (?\u03F7 ?\u03F8) ;; GREEK CAPITAL LETTER SHO + (?\u03F9 ?\u03F2) ;; GREEK CAPITAL LUNATE SIGMA SYMBOL + (?\u03FA ?\u03FB) ;; GREEK CAPITAL LETTER SAN + (?\u03FD ?\u037B) ;; GREEK CAPITAL REVERSED LUNATE SIGMA SYMBOL + (?\u03FE ?\u037C) ;; GREEK CAPITAL DOTTED LUNATE SIGMA SYMBOL + (?\u03FF ?\u037D) ;; GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL + (?\u0400 ?\u0450) ;; CYRILLIC CAPITAL LETTER IE WITH GRAVE + (?\u0401 ?\u0451) ;; CYRILLIC CAPITAL LETTER IO + (?\u0402 ?\u0452) ;; CYRILLIC CAPITAL LETTER DJE + (?\u0403 ?\u0453) ;; CYRILLIC CAPITAL LETTER GJE + (?\u0404 ?\u0454) ;; CYRILLIC CAPITAL LETTER UKRAINIAN IE + (?\u0405 ?\u0455) ;; CYRILLIC CAPITAL LETTER DZE + (?\u0406 ?\u0456) ;; CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I + (?\u0407 ?\u0457) ;; CYRILLIC CAPITAL LETTER YI + (?\u0408 ?\u0458) ;; CYRILLIC CAPITAL LETTER JE + (?\u0409 ?\u0459) ;; CYRILLIC CAPITAL LETTER LJE + (?\u040A ?\u045A) ;; CYRILLIC CAPITAL LETTER NJE + (?\u040B ?\u045B) ;; CYRILLIC CAPITAL LETTER TSHE + (?\u040C ?\u045C) ;; CYRILLIC CAPITAL LETTER KJE + (?\u040D ?\u045D) ;; CYRILLIC CAPITAL LETTER I WITH GRAVE + (?\u040E ?\u045E) ;; CYRILLIC CAPITAL LETTER SHORT U + (?\u040F ?\u045F) ;; CYRILLIC CAPITAL LETTER DZHE + (?\u0410 ?\u0430) ;; CYRILLIC CAPITAL LETTER A + (?\u0411 ?\u0431) ;; CYRILLIC CAPITAL LETTER BE + (?\u0412 ?\u0432) ;; CYRILLIC CAPITAL LETTER VE + (?\u0413 ?\u0433) ;; CYRILLIC CAPITAL LETTER GHE + (?\u0414 ?\u0434) ;; CYRILLIC CAPITAL LETTER DE + (?\u0415 ?\u0435) ;; CYRILLIC CAPITAL LETTER IE + (?\u0416 ?\u0436) ;; CYRILLIC CAPITAL LETTER ZHE + (?\u0417 ?\u0437) ;; CYRILLIC CAPITAL LETTER ZE + (?\u0418 ?\u0438) ;; CYRILLIC CAPITAL LETTER I + (?\u0419 ?\u0439) ;; CYRILLIC CAPITAL LETTER SHORT I + (?\u041A ?\u043A) ;; CYRILLIC CAPITAL LETTER KA + (?\u041B ?\u043B) ;; CYRILLIC CAPITAL LETTER EL + (?\u041C ?\u043C) ;; CYRILLIC CAPITAL LETTER EM + (?\u041D ?\u043D) ;; CYRILLIC CAPITAL LETTER EN + (?\u041E ?\u043E) ;; CYRILLIC CAPITAL LETTER O + (?\u041F ?\u043F) ;; CYRILLIC CAPITAL LETTER PE + (?\u0420 ?\u0440) ;; CYRILLIC CAPITAL LETTER ER + (?\u0421 ?\u0441) ;; CYRILLIC CAPITAL LETTER ES + (?\u0422 ?\u0442) ;; CYRILLIC CAPITAL LETTER TE + (?\u0423 ?\u0443) ;; CYRILLIC CAPITAL LETTER U + (?\u0424 ?\u0444) ;; CYRILLIC CAPITAL LETTER EF + (?\u0425 ?\u0445) ;; CYRILLIC CAPITAL LETTER HA + (?\u0426 ?\u0446) ;; CYRILLIC CAPITAL LETTER TSE + (?\u0427 ?\u0447) ;; CYRILLIC CAPITAL LETTER CHE + (?\u0428 ?\u0448) ;; CYRILLIC CAPITAL LETTER SHA + (?\u0429 ?\u0449) ;; CYRILLIC CAPITAL LETTER SHCHA + (?\u042A ?\u044A) ;; CYRILLIC CAPITAL LETTER HARD SIGN + (?\u042B ?\u044B) ;; CYRILLIC CAPITAL LETTER YERU + (?\u042C ?\u044C) ;; CYRILLIC CAPITAL LETTER SOFT SIGN + (?\u042D ?\u044D) ;; CYRILLIC CAPITAL LETTER E + (?\u042E ?\u044E) ;; CYRILLIC CAPITAL LETTER YU + (?\u042F ?\u044F) ;; CYRILLIC CAPITAL LETTER YA + (?\u0460 ?\u0461) ;; CYRILLIC CAPITAL LETTER OMEGA + (?\u0462 ?\u0463) ;; CYRILLIC CAPITAL LETTER YAT + (?\u0464 ?\u0465) ;; CYRILLIC CAPITAL LETTER IOTIFIED E + (?\u0466 ?\u0467) ;; CYRILLIC CAPITAL LETTER LITTLE YUS + (?\u0468 ?\u0469) ;; CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS + (?\u046A ?\u046B) ;; CYRILLIC CAPITAL LETTER BIG YUS + (?\u046C ?\u046D) ;; CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS + (?\u046E ?\u046F) ;; CYRILLIC CAPITAL LETTER KSI + (?\u0470 ?\u0471) ;; CYRILLIC CAPITAL LETTER PSI + (?\u0472 ?\u0473) ;; CYRILLIC CAPITAL LETTER FITA + (?\u0474 ?\u0475) ;; CYRILLIC CAPITAL LETTER IZHITSA + (?\u0476 ?\u0477) ;; CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT + (?\u0478 ?\u0479) ;; CYRILLIC CAPITAL LETTER UK + (?\u047A ?\u047B) ;; CYRILLIC CAPITAL LETTER ROUND OMEGA + (?\u047C ?\u047D) ;; CYRILLIC CAPITAL LETTER OMEGA WITH TITLO + (?\u047E ?\u047F) ;; CYRILLIC CAPITAL LETTER OT + (?\u0480 ?\u0481) ;; CYRILLIC CAPITAL LETTER KOPPA + (?\u048A ?\u048B) ;; CYRILLIC CAPITAL LETTER SHORT I WITH TAIL + (?\u048C ?\u048D) ;; CYRILLIC CAPITAL LETTER SEMISOFT SIGN + (?\u048E ?\u048F) ;; CYRILLIC CAPITAL LETTER ER WITH TICK + (?\u0490 ?\u0491) ;; CYRILLIC CAPITAL LETTER GHE WITH UPTURN + (?\u0492 ?\u0493) ;; CYRILLIC CAPITAL LETTER GHE WITH STROKE + (?\u0494 ?\u0495) ;; CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK + (?\u0496 ?\u0497) ;; CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER + (?\u0498 ?\u0499) ;; CYRILLIC CAPITAL LETTER ZE WITH DESCENDER + (?\u049A ?\u049B) ;; CYRILLIC CAPITAL LETTER KA WITH DESCENDER + (?\u049C ?\u049D) ;; CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE + (?\u049E ?\u049F) ;; CYRILLIC CAPITAL LETTER KA WITH STROKE + (?\u04A0 ?\u04A1) ;; CYRILLIC CAPITAL LETTER BASHKIR KA + (?\u04A2 ?\u04A3) ;; CYRILLIC CAPITAL LETTER EN WITH DESCENDER + (?\u04A4 ?\u04A5) ;; CYRILLIC CAPITAL LIGATURE EN GHE + (?\u04A6 ?\u04A7) ;; CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK + (?\u04A8 ?\u04A9) ;; CYRILLIC CAPITAL LETTER ABKHASIAN HA + (?\u04AA ?\u04AB) ;; CYRILLIC CAPITAL LETTER ES WITH DESCENDER + (?\u04AC ?\u04AD) ;; CYRILLIC CAPITAL LETTER TE WITH DESCENDER + (?\u04AE ?\u04AF) ;; CYRILLIC CAPITAL LETTER STRAIGHT U + (?\u04B0 ?\u04B1) ;; CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE + (?\u04B2 ?\u04B3) ;; CYRILLIC CAPITAL LETTER HA WITH DESCENDER + (?\u04B4 ?\u04B5) ;; CYRILLIC CAPITAL LIGATURE TE TSE + (?\u04B6 ?\u04B7) ;; CYRILLIC CAPITAL LETTER CHE WITH DESCENDER + (?\u04B8 ?\u04B9) ;; CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE + (?\u04BA ?\u04BB) ;; CYRILLIC CAPITAL LETTER SHHA + (?\u04BC ?\u04BD) ;; CYRILLIC CAPITAL LETTER ABKHASIAN CHE + (?\u04BE ?\u04BF) ;; CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER + (?\u04C0 ?\u04CF) ;; CYRILLIC LETTER PALOCHKA + (?\u04C1 ?\u04C2) ;; CYRILLIC CAPITAL LETTER ZHE WITH BREVE + (?\u04C3 ?\u04C4) ;; CYRILLIC CAPITAL LETTER KA WITH HOOK + (?\u04C5 ?\u04C6) ;; CYRILLIC CAPITAL LETTER EL WITH TAIL + (?\u04C7 ?\u04C8) ;; CYRILLIC CAPITAL LETTER EN WITH HOOK + (?\u04C9 ?\u04CA) ;; CYRILLIC CAPITAL LETTER EN WITH TAIL + (?\u04CB ?\u04CC) ;; CYRILLIC CAPITAL LETTER KHAKASSIAN CHE + (?\u04CD ?\u04CE) ;; CYRILLIC CAPITAL LETTER EM WITH TAIL + (?\u04D0 ?\u04D1) ;; CYRILLIC CAPITAL LETTER A WITH BREVE + (?\u04D2 ?\u04D3) ;; CYRILLIC CAPITAL LETTER A WITH DIAERESIS + (?\u04D4 ?\u04D5) ;; CYRILLIC CAPITAL LIGATURE A IE + (?\u04D6 ?\u04D7) ;; CYRILLIC CAPITAL LETTER IE WITH BREVE + (?\u04D8 ?\u04D9) ;; CYRILLIC CAPITAL LETTER SCHWA + (?\u04DA ?\u04DB) ;; CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS + (?\u04DC ?\u04DD) ;; CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS + (?\u04DE ?\u04DF) ;; CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS + (?\u04E0 ?\u04E1) ;; CYRILLIC CAPITAL LETTER ABKHASIAN DZE + (?\u04E2 ?\u04E3) ;; CYRILLIC CAPITAL LETTER I WITH MACRON + (?\u04E4 ?\u04E5) ;; CYRILLIC CAPITAL LETTER I WITH DIAERESIS + (?\u04E6 ?\u04E7) ;; CYRILLIC CAPITAL LETTER O WITH DIAERESIS + (?\u04E8 ?\u04E9) ;; CYRILLIC CAPITAL LETTER BARRED O + (?\u04EA ?\u04EB) ;; CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS + (?\u04EC ?\u04ED) ;; CYRILLIC CAPITAL LETTER E WITH DIAERESIS + (?\u04EE ?\u04EF) ;; CYRILLIC CAPITAL LETTER U WITH MACRON + (?\u04F0 ?\u04F1) ;; CYRILLIC CAPITAL LETTER U WITH DIAERESIS + (?\u04F2 ?\u04F3) ;; CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE + (?\u04F4 ?\u04F5) ;; CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS + (?\u04F6 ?\u04F7) ;; CYRILLIC CAPITAL LETTER GHE WITH DESCENDER + (?\u04F8 ?\u04F9) ;; CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS + (?\u04FA ?\u04FB) ;; CYRILLIC CAPITAL LETTER GHE WITH STROKE AND HOOK + (?\u04FC ?\u04FD) ;; CYRILLIC CAPITAL LETTER HA WITH HOOK + (?\u04FE ?\u04FF) ;; CYRILLIC CAPITAL LETTER HA WITH STROKE + (?\u0500 ?\u0501) ;; CYRILLIC CAPITAL LETTER KOMI DE + (?\u0502 ?\u0503) ;; CYRILLIC CAPITAL LETTER KOMI DJE + (?\u0504 ?\u0505) ;; CYRILLIC CAPITAL LETTER KOMI ZJE + (?\u0506 ?\u0507) ;; CYRILLIC CAPITAL LETTER KOMI DZJE + (?\u0508 ?\u0509) ;; CYRILLIC CAPITAL LETTER KOMI LJE + (?\u050A ?\u050B) ;; CYRILLIC CAPITAL LETTER KOMI NJE + (?\u050C ?\u050D) ;; CYRILLIC CAPITAL LETTER KOMI SJE + (?\u050E ?\u050F) ;; CYRILLIC CAPITAL LETTER KOMI TJE + (?\u0510 ?\u0511) ;; CYRILLIC CAPITAL LETTER REVERSED ZE + (?\u0512 ?\u0513) ;; CYRILLIC CAPITAL LETTER EL WITH HOOK + (?\u0514 ?\u0515) ;; CYRILLIC CAPITAL LETTER LHA + (?\u0516 ?\u0517) ;; CYRILLIC CAPITAL LETTER RHA + (?\u0518 ?\u0519) ;; CYRILLIC CAPITAL LETTER YAE + (?\u051A ?\u051B) ;; CYRILLIC CAPITAL LETTER QA + (?\u051C ?\u051D) ;; CYRILLIC CAPITAL LETTER WE + (?\u051E ?\u051F) ;; CYRILLIC CAPITAL LETTER ALEUT KA + (?\u0520 ?\u0521) ;; CYRILLIC CAPITAL LETTER EL WITH MIDDLE HOOK + (?\u0522 ?\u0523) ;; CYRILLIC CAPITAL LETTER EN WITH MIDDLE HOOK + (?\u0524 ?\u0525) ;; CYRILLIC CAPITAL LETTER PE WITH DESCENDER + (?\u0531 ?\u0561) ;; ARMENIAN CAPITAL LETTER AYB + (?\u0532 ?\u0562) ;; ARMENIAN CAPITAL LETTER BEN + (?\u0533 ?\u0563) ;; ARMENIAN CAPITAL LETTER GIM + (?\u0534 ?\u0564) ;; ARMENIAN CAPITAL LETTER DA + (?\u0535 ?\u0565) ;; ARMENIAN CAPITAL LETTER ECH + (?\u0536 ?\u0566) ;; ARMENIAN CAPITAL LETTER ZA + (?\u0537 ?\u0567) ;; ARMENIAN CAPITAL LETTER EH + (?\u0538 ?\u0568) ;; ARMENIAN CAPITAL LETTER ET + (?\u0539 ?\u0569) ;; ARMENIAN CAPITAL LETTER TO + (?\u053A ?\u056A) ;; ARMENIAN CAPITAL LETTER ZHE + (?\u053B ?\u056B) ;; ARMENIAN CAPITAL LETTER INI + (?\u053C ?\u056C) ;; ARMENIAN CAPITAL LETTER LIWN + (?\u053D ?\u056D) ;; ARMENIAN CAPITAL LETTER XEH + (?\u053E ?\u056E) ;; ARMENIAN CAPITAL LETTER CA + (?\u053F ?\u056F) ;; ARMENIAN CAPITAL LETTER KEN + (?\u0540 ?\u0570) ;; ARMENIAN CAPITAL LETTER HO + (?\u0541 ?\u0571) ;; ARMENIAN CAPITAL LETTER JA + (?\u0542 ?\u0572) ;; ARMENIAN CAPITAL LETTER GHAD + (?\u0543 ?\u0573) ;; ARMENIAN CAPITAL LETTER CHEH + (?\u0544 ?\u0574) ;; ARMENIAN CAPITAL LETTER MEN + (?\u0545 ?\u0575) ;; ARMENIAN CAPITAL LETTER YI + (?\u0546 ?\u0576) ;; ARMENIAN CAPITAL LETTER NOW + (?\u0547 ?\u0577) ;; ARMENIAN CAPITAL LETTER SHA + (?\u0548 ?\u0578) ;; ARMENIAN CAPITAL LETTER VO + (?\u0549 ?\u0579) ;; ARMENIAN CAPITAL LETTER CHA + (?\u054A ?\u057A) ;; ARMENIAN CAPITAL LETTER PEH + (?\u054B ?\u057B) ;; ARMENIAN CAPITAL LETTER JHEH + (?\u054C ?\u057C) ;; ARMENIAN CAPITAL LETTER RA + (?\u054D ?\u057D) ;; ARMENIAN CAPITAL LETTER SEH + (?\u054E ?\u057E) ;; ARMENIAN CAPITAL LETTER VEW + (?\u054F ?\u057F) ;; ARMENIAN CAPITAL LETTER TIWN + (?\u0550 ?\u0580) ;; ARMENIAN CAPITAL LETTER REH + (?\u0551 ?\u0581) ;; ARMENIAN CAPITAL LETTER CO + (?\u0552 ?\u0582) ;; ARMENIAN CAPITAL LETTER YIWN + (?\u0553 ?\u0583) ;; ARMENIAN CAPITAL LETTER PIWR + (?\u0554 ?\u0584) ;; ARMENIAN CAPITAL LETTER KEH + (?\u0555 ?\u0585) ;; ARMENIAN CAPITAL LETTER OH + (?\u0556 ?\u0586) ;; ARMENIAN CAPITAL LETTER FEH +;;; WARNING: Unhandled full mapping: +;;; 0587; F; 0565 0582; # ARMENIAN SMALL LIGATURE ECH YIWN + (?\u10A0 ?\u2D00) ;; GEORGIAN CAPITAL LETTER AN + (?\u10A1 ?\u2D01) ;; GEORGIAN CAPITAL LETTER BAN + (?\u10A2 ?\u2D02) ;; GEORGIAN CAPITAL LETTER GAN + (?\u10A3 ?\u2D03) ;; GEORGIAN CAPITAL LETTER DON + (?\u10A4 ?\u2D04) ;; GEORGIAN CAPITAL LETTER EN + (?\u10A5 ?\u2D05) ;; GEORGIAN CAPITAL LETTER VIN + (?\u10A6 ?\u2D06) ;; GEORGIAN CAPITAL LETTER ZEN + (?\u10A7 ?\u2D07) ;; GEORGIAN CAPITAL LETTER TAN + (?\u10A8 ?\u2D08) ;; GEORGIAN CAPITAL LETTER IN + (?\u10A9 ?\u2D09) ;; GEORGIAN CAPITAL LETTER KAN + (?\u10AA ?\u2D0A) ;; GEORGIAN CAPITAL LETTER LAS + (?\u10AB ?\u2D0B) ;; GEORGIAN CAPITAL LETTER MAN + (?\u10AC ?\u2D0C) ;; GEORGIAN CAPITAL LETTER NAR + (?\u10AD ?\u2D0D) ;; GEORGIAN CAPITAL LETTER ON + (?\u10AE ?\u2D0E) ;; GEORGIAN CAPITAL LETTER PAR + (?\u10AF ?\u2D0F) ;; GEORGIAN CAPITAL LETTER ZHAR + (?\u10B0 ?\u2D10) ;; GEORGIAN CAPITAL LETTER RAE + (?\u10B1 ?\u2D11) ;; GEORGIAN CAPITAL LETTER SAN + (?\u10B2 ?\u2D12) ;; GEORGIAN CAPITAL LETTER TAR + (?\u10B3 ?\u2D13) ;; GEORGIAN CAPITAL LETTER UN + (?\u10B4 ?\u2D14) ;; GEORGIAN CAPITAL LETTER PHAR + (?\u10B5 ?\u2D15) ;; GEORGIAN CAPITAL LETTER KHAR + (?\u10B6 ?\u2D16) ;; GEORGIAN CAPITAL LETTER GHAN + (?\u10B7 ?\u2D17) ;; GEORGIAN CAPITAL LETTER QAR + (?\u10B8 ?\u2D18) ;; GEORGIAN CAPITAL LETTER SHIN + (?\u10B9 ?\u2D19) ;; GEORGIAN CAPITAL LETTER CHIN + (?\u10BA ?\u2D1A) ;; GEORGIAN CAPITAL LETTER CAN + (?\u10BB ?\u2D1B) ;; GEORGIAN CAPITAL LETTER JIL + (?\u10BC ?\u2D1C) ;; GEORGIAN CAPITAL LETTER CIL + (?\u10BD ?\u2D1D) ;; GEORGIAN CAPITAL LETTER CHAR + (?\u10BE ?\u2D1E) ;; GEORGIAN CAPITAL LETTER XAN + (?\u10BF ?\u2D1F) ;; GEORGIAN CAPITAL LETTER JHAN + (?\u10C0 ?\u2D20) ;; GEORGIAN CAPITAL LETTER HAE + (?\u10C1 ?\u2D21) ;; GEORGIAN CAPITAL LETTER HE + (?\u10C2 ?\u2D22) ;; GEORGIAN CAPITAL LETTER HIE + (?\u10C3 ?\u2D23) ;; GEORGIAN CAPITAL LETTER WE + (?\u10C4 ?\u2D24) ;; GEORGIAN CAPITAL LETTER HAR + (?\u10C5 ?\u2D25) ;; GEORGIAN CAPITAL LETTER HOE + (?\u1E00 ?\u1E01) ;; LATIN CAPITAL LETTER A WITH RING BELOW + (?\u1E02 ?\u1E03) ;; LATIN CAPITAL LETTER B WITH DOT ABOVE + (?\u1E04 ?\u1E05) ;; LATIN CAPITAL LETTER B WITH DOT BELOW + (?\u1E06 ?\u1E07) ;; LATIN CAPITAL LETTER B WITH LINE BELOW + (?\u1E08 ?\u1E09) ;; LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE + (?\u1E0A ?\u1E0B) ;; LATIN CAPITAL LETTER D WITH DOT ABOVE + (?\u1E0C ?\u1E0D) ;; LATIN CAPITAL LETTER D WITH DOT BELOW + (?\u1E0E ?\u1E0F) ;; LATIN CAPITAL LETTER D WITH LINE BELOW + (?\u1E10 ?\u1E11) ;; LATIN CAPITAL LETTER D WITH CEDILLA + (?\u1E12 ?\u1E13) ;; LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW + (?\u1E14 ?\u1E15) ;; LATIN CAPITAL LETTER E WITH MACRON AND GRAVE + (?\u1E16 ?\u1E17) ;; LATIN CAPITAL LETTER E WITH MACRON AND ACUTE + (?\u1E18 ?\u1E19) ;; LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW + (?\u1E1A ?\u1E1B) ;; LATIN CAPITAL LETTER E WITH TILDE BELOW + (?\u1E1C ?\u1E1D) ;; LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE + (?\u1E1E ?\u1E1F) ;; LATIN CAPITAL LETTER F WITH DOT ABOVE + (?\u1E20 ?\u1E21) ;; LATIN CAPITAL LETTER G WITH MACRON + (?\u1E22 ?\u1E23) ;; LATIN CAPITAL LETTER H WITH DOT ABOVE + (?\u1E24 ?\u1E25) ;; LATIN CAPITAL LETTER H WITH DOT BELOW + (?\u1E26 ?\u1E27) ;; LATIN CAPITAL LETTER H WITH DIAERESIS + (?\u1E28 ?\u1E29) ;; LATIN CAPITAL LETTER H WITH CEDILLA + (?\u1E2A ?\u1E2B) ;; LATIN CAPITAL LETTER H WITH BREVE BELOW + (?\u1E2C ?\u1E2D) ;; LATIN CAPITAL LETTER I WITH TILDE BELOW + (?\u1E2E ?\u1E2F) ;; LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE + (?\u1E30 ?\u1E31) ;; LATIN CAPITAL LETTER K WITH ACUTE + (?\u1E32 ?\u1E33) ;; LATIN CAPITAL LETTER K WITH DOT BELOW + (?\u1E34 ?\u1E35) ;; LATIN CAPITAL LETTER K WITH LINE BELOW + (?\u1E36 ?\u1E37) ;; LATIN CAPITAL LETTER L WITH DOT BELOW + (?\u1E38 ?\u1E39) ;; LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON + (?\u1E3A ?\u1E3B) ;; LATIN CAPITAL LETTER L WITH LINE BELOW + (?\u1E3C ?\u1E3D) ;; LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW + (?\u1E3E ?\u1E3F) ;; LATIN CAPITAL LETTER M WITH ACUTE + (?\u1E40 ?\u1E41) ;; LATIN CAPITAL LETTER M WITH DOT ABOVE + (?\u1E42 ?\u1E43) ;; LATIN CAPITAL LETTER M WITH DOT BELOW + (?\u1E44 ?\u1E45) ;; LATIN CAPITAL LETTER N WITH DOT ABOVE + (?\u1E46 ?\u1E47) ;; LATIN CAPITAL LETTER N WITH DOT BELOW + (?\u1E48 ?\u1E49) ;; LATIN CAPITAL LETTER N WITH LINE BELOW + (?\u1E4A ?\u1E4B) ;; LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW + (?\u1E4C ?\u1E4D) ;; LATIN CAPITAL LETTER O WITH TILDE AND ACUTE + (?\u1E4E ?\u1E4F) ;; LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS + (?\u1E50 ?\u1E51) ;; LATIN CAPITAL LETTER O WITH MACRON AND GRAVE + (?\u1E52 ?\u1E53) ;; LATIN CAPITAL LETTER O WITH MACRON AND ACUTE + (?\u1E54 ?\u1E55) ;; LATIN CAPITAL LETTER P WITH ACUTE + (?\u1E56 ?\u1E57) ;; LATIN CAPITAL LETTER P WITH DOT ABOVE + (?\u1E58 ?\u1E59) ;; LATIN CAPITAL LETTER R WITH DOT ABOVE + (?\u1E5A ?\u1E5B) ;; LATIN CAPITAL LETTER R WITH DOT BELOW + (?\u1E5C ?\u1E5D) ;; LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON + (?\u1E5E ?\u1E5F) ;; LATIN CAPITAL LETTER R WITH LINE BELOW + (?\u1E60 ?\u1E61) ;; LATIN CAPITAL LETTER S WITH DOT ABOVE + (?\u1E62 ?\u1E63) ;; LATIN CAPITAL LETTER S WITH DOT BELOW + (?\u1E64 ?\u1E65) ;; LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE + (?\u1E66 ?\u1E67) ;; LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE + (?\u1E68 ?\u1E69) ;; LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE + (?\u1E6A ?\u1E6B) ;; LATIN CAPITAL LETTER T WITH DOT ABOVE + (?\u1E6C ?\u1E6D) ;; LATIN CAPITAL LETTER T WITH DOT BELOW + (?\u1E6E ?\u1E6F) ;; LATIN CAPITAL LETTER T WITH LINE BELOW + (?\u1E70 ?\u1E71) ;; LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW + (?\u1E72 ?\u1E73) ;; LATIN CAPITAL LETTER U WITH DIAERESIS BELOW + (?\u1E74 ?\u1E75) ;; LATIN CAPITAL LETTER U WITH TILDE BELOW + (?\u1E76 ?\u1E77) ;; LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW + (?\u1E78 ?\u1E79) ;; LATIN CAPITAL LETTER U WITH TILDE AND ACUTE + (?\u1E7A ?\u1E7B) ;; LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS + (?\u1E7C ?\u1E7D) ;; LATIN CAPITAL LETTER V WITH TILDE + (?\u1E7E ?\u1E7F) ;; LATIN CAPITAL LETTER V WITH DOT BELOW + (?\u1E80 ?\u1E81) ;; LATIN CAPITAL LETTER W WITH GRAVE + (?\u1E82 ?\u1E83) ;; LATIN CAPITAL LETTER W WITH ACUTE + (?\u1E84 ?\u1E85) ;; LATIN CAPITAL LETTER W WITH DIAERESIS + (?\u1E86 ?\u1E87) ;; LATIN CAPITAL LETTER W WITH DOT ABOVE + (?\u1E88 ?\u1E89) ;; LATIN CAPITAL LETTER W WITH DOT BELOW + (?\u1E8A ?\u1E8B) ;; LATIN CAPITAL LETTER X WITH DOT ABOVE + (?\u1E8C ?\u1E8D) ;; LATIN CAPITAL LETTER X WITH DIAERESIS + (?\u1E8E ?\u1E8F) ;; LATIN CAPITAL LETTER Y WITH DOT ABOVE + (?\u1E90 ?\u1E91) ;; LATIN CAPITAL LETTER Z WITH CIRCUMFLEX + (?\u1E92 ?\u1E93) ;; LATIN CAPITAL LETTER Z WITH DOT BELOW + (?\u1E94 ?\u1E95) ;; LATIN CAPITAL LETTER Z WITH LINE BELOW +;;; WARNING: Unhandled full mapping: +;;; 1E96; F; 0068 0331; # LATIN SMALL LETTER H WITH LINE BELOW +;;; WARNING: Unhandled full mapping: +;;; 1E97; F; 0074 0308; # LATIN SMALL LETTER T WITH DIAERESIS +;;; WARNING: Unhandled full mapping: +;;; 1E98; F; 0077 030A; # LATIN SMALL LETTER W WITH RING ABOVE +;;; WARNING: Unhandled full mapping: +;;; 1E99; F; 0079 030A; # LATIN SMALL LETTER Y WITH RING ABOVE +;;; WARNING: Unhandled full mapping: +;;; 1E9A; F; 0061 02BE; # LATIN SMALL LETTER A WITH RIGHT HALF RING + (?\u1E9B ?\u1E61) ;; LATIN SMALL LETTER LONG S WITH DOT ABOVE +;;; WARNING: Unhandled full mapping: +;;; 1E9E; F; 0073 0073; # LATIN CAPITAL LETTER SHARP S + (?\u1E9E ?\u00DF) ;; LATIN CAPITAL LETTER SHARP S + (?\u1EA0 ?\u1EA1) ;; LATIN CAPITAL LETTER A WITH DOT BELOW + (?\u1EA2 ?\u1EA3) ;; LATIN CAPITAL LETTER A WITH HOOK ABOVE + (?\u1EA4 ?\u1EA5) ;; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE + (?\u1EA6 ?\u1EA7) ;; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE + (?\u1EA8 ?\u1EA9) ;; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE + (?\u1EAA ?\u1EAB) ;; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE + (?\u1EAC ?\u1EAD) ;; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW + (?\u1EAE ?\u1EAF) ;; LATIN CAPITAL LETTER A WITH BREVE AND ACUTE + (?\u1EB0 ?\u1EB1) ;; LATIN CAPITAL LETTER A WITH BREVE AND GRAVE + (?\u1EB2 ?\u1EB3) ;; LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE + (?\u1EB4 ?\u1EB5) ;; LATIN CAPITAL LETTER A WITH BREVE AND TILDE + (?\u1EB6 ?\u1EB7) ;; LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW + (?\u1EB8 ?\u1EB9) ;; LATIN CAPITAL LETTER E WITH DOT BELOW + (?\u1EBA ?\u1EBB) ;; LATIN CAPITAL LETTER E WITH HOOK ABOVE + (?\u1EBC ?\u1EBD) ;; LATIN CAPITAL LETTER E WITH TILDE + (?\u1EBE ?\u1EBF) ;; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE + (?\u1EC0 ?\u1EC1) ;; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE + (?\u1EC2 ?\u1EC3) ;; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE + (?\u1EC4 ?\u1EC5) ;; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE + (?\u1EC6 ?\u1EC7) ;; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW + (?\u1EC8 ?\u1EC9) ;; LATIN CAPITAL LETTER I WITH HOOK ABOVE + (?\u1ECA ?\u1ECB) ;; LATIN CAPITAL LETTER I WITH DOT BELOW + (?\u1ECC ?\u1ECD) ;; LATIN CAPITAL LETTER O WITH DOT BELOW + (?\u1ECE ?\u1ECF) ;; LATIN CAPITAL LETTER O WITH HOOK ABOVE + (?\u1ED0 ?\u1ED1) ;; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE + (?\u1ED2 ?\u1ED3) ;; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE + (?\u1ED4 ?\u1ED5) ;; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE + (?\u1ED6 ?\u1ED7) ;; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE + (?\u1ED8 ?\u1ED9) ;; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW + (?\u1EDA ?\u1EDB) ;; LATIN CAPITAL LETTER O WITH HORN AND ACUTE + (?\u1EDC ?\u1EDD) ;; LATIN CAPITAL LETTER O WITH HORN AND GRAVE + (?\u1EDE ?\u1EDF) ;; LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE + (?\u1EE0 ?\u1EE1) ;; LATIN CAPITAL LETTER O WITH HORN AND TILDE + (?\u1EE2 ?\u1EE3) ;; LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW + (?\u1EE4 ?\u1EE5) ;; LATIN CAPITAL LETTER U WITH DOT BELOW + (?\u1EE6 ?\u1EE7) ;; LATIN CAPITAL LETTER U WITH HOOK ABOVE + (?\u1EE8 ?\u1EE9) ;; LATIN CAPITAL LETTER U WITH HORN AND ACUTE + (?\u1EEA ?\u1EEB) ;; LATIN CAPITAL LETTER U WITH HORN AND GRAVE + (?\u1EEC ?\u1EED) ;; LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE + (?\u1EEE ?\u1EEF) ;; LATIN CAPITAL LETTER U WITH HORN AND TILDE + (?\u1EF0 ?\u1EF1) ;; LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW + (?\u1EF2 ?\u1EF3) ;; LATIN CAPITAL LETTER Y WITH GRAVE + (?\u1EF4 ?\u1EF5) ;; LATIN CAPITAL LETTER Y WITH DOT BELOW + (?\u1EF6 ?\u1EF7) ;; LATIN CAPITAL LETTER Y WITH HOOK ABOVE + (?\u1EF8 ?\u1EF9) ;; LATIN CAPITAL LETTER Y WITH TILDE + (?\u1EFA ?\u1EFB) ;; LATIN CAPITAL LETTER MIDDLE-WELSH LL + (?\u1EFC ?\u1EFD) ;; LATIN CAPITAL LETTER MIDDLE-WELSH V + (?\u1EFE ?\u1EFF) ;; LATIN CAPITAL LETTER Y WITH LOOP + (?\u1F08 ?\u1F00) ;; GREEK CAPITAL LETTER ALPHA WITH PSILI + (?\u1F09 ?\u1F01) ;; GREEK CAPITAL LETTER ALPHA WITH DASIA + (?\u1F0A ?\u1F02) ;; GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA + (?\u1F0B ?\u1F03) ;; GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA + (?\u1F0C ?\u1F04) ;; GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA + (?\u1F0D ?\u1F05) ;; GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA + (?\u1F0E ?\u1F06) ;; GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI + (?\u1F0F ?\u1F07) ;; GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI + (?\u1F18 ?\u1F10) ;; GREEK CAPITAL LETTER EPSILON WITH PSILI + (?\u1F19 ?\u1F11) ;; GREEK CAPITAL LETTER EPSILON WITH DASIA + (?\u1F1A ?\u1F12) ;; GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA + (?\u1F1B ?\u1F13) ;; GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA + (?\u1F1C ?\u1F14) ;; GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA + (?\u1F1D ?\u1F15) ;; GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA + (?\u1F28 ?\u1F20) ;; GREEK CAPITAL LETTER ETA WITH PSILI + (?\u1F29 ?\u1F21) ;; GREEK CAPITAL LETTER ETA WITH DASIA + (?\u1F2A ?\u1F22) ;; GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA + (?\u1F2B ?\u1F23) ;; GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA + (?\u1F2C ?\u1F24) ;; GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA + (?\u1F2D ?\u1F25) ;; GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA + (?\u1F2E ?\u1F26) ;; GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI + (?\u1F2F ?\u1F27) ;; GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI + (?\u1F38 ?\u1F30) ;; GREEK CAPITAL LETTER IOTA WITH PSILI + (?\u1F39 ?\u1F31) ;; GREEK CAPITAL LETTER IOTA WITH DASIA + (?\u1F3A ?\u1F32) ;; GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA + (?\u1F3B ?\u1F33) ;; GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA + (?\u1F3C ?\u1F34) ;; GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA + (?\u1F3D ?\u1F35) ;; GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA + (?\u1F3E ?\u1F36) ;; GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI + (?\u1F3F ?\u1F37) ;; GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI + (?\u1F48 ?\u1F40) ;; GREEK CAPITAL LETTER OMICRON WITH PSILI + (?\u1F49 ?\u1F41) ;; GREEK CAPITAL LETTER OMICRON WITH DASIA + (?\u1F4A ?\u1F42) ;; GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA + (?\u1F4B ?\u1F43) ;; GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA + (?\u1F4C ?\u1F44) ;; GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA + (?\u1F4D ?\u1F45) ;; GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA +;;; WARNING: Unhandled full mapping: +;;; 1F50; F; 03C5 0313; # GREEK SMALL LETTER UPSILON WITH PSILI +;;; WARNING: Unhandled full mapping: +;;; 1F52; F; 03C5 0313 0300; # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA +;;; WARNING: Unhandled full mapping: +;;; 1F54; F; 03C5 0313 0301; # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA +;;; WARNING: Unhandled full mapping: +;;; 1F56; F; 03C5 0313 0342; # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI + (?\u1F59 ?\u1F51) ;; GREEK CAPITAL LETTER UPSILON WITH DASIA + (?\u1F5B ?\u1F53) ;; GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA + (?\u1F5D ?\u1F55) ;; GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA + (?\u1F5F ?\u1F57) ;; GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI + (?\u1F68 ?\u1F60) ;; GREEK CAPITAL LETTER OMEGA WITH PSILI + (?\u1F69 ?\u1F61) ;; GREEK CAPITAL LETTER OMEGA WITH DASIA + (?\u1F6A ?\u1F62) ;; GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA + (?\u1F6B ?\u1F63) ;; GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA + (?\u1F6C ?\u1F64) ;; GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA + (?\u1F6D ?\u1F65) ;; GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA + (?\u1F6E ?\u1F66) ;; GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI + (?\u1F6F ?\u1F67) ;; GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI +;;; WARNING: Unhandled full mapping: +;;; 1F80; F; 1F00 03B9; # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F81; F; 1F01 03B9; # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F82; F; 1F02 03B9; # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F83; F; 1F03 03B9; # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F84; F; 1F04 03B9; # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F85; F; 1F05 03B9; # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F86; F; 1F06 03B9; # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F87; F; 1F07 03B9; # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F88; F; 1F00 03B9; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI + (?\u1F88 ?\u1F80) ;; GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F89; F; 1F01 03B9; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI + (?\u1F89 ?\u1F81) ;; GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F8A; F; 1F02 03B9; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI + (?\u1F8A ?\u1F82) ;; GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F8B; F; 1F03 03B9; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI + (?\u1F8B ?\u1F83) ;; GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F8C; F; 1F04 03B9; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI + (?\u1F8C ?\u1F84) ;; GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F8D; F; 1F05 03B9; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI + (?\u1F8D ?\u1F85) ;; GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F8E; F; 1F06 03B9; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI + (?\u1F8E ?\u1F86) ;; GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F8F; F; 1F07 03B9; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI + (?\u1F8F ?\u1F87) ;; GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F90; F; 1F20 03B9; # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F91; F; 1F21 03B9; # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F92; F; 1F22 03B9; # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F93; F; 1F23 03B9; # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F94; F; 1F24 03B9; # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F95; F; 1F25 03B9; # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F96; F; 1F26 03B9; # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F97; F; 1F27 03B9; # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F98; F; 1F20 03B9; # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI + (?\u1F98 ?\u1F90) ;; GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F99; F; 1F21 03B9; # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI + (?\u1F99 ?\u1F91) ;; GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F9A; F; 1F22 03B9; # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI + (?\u1F9A ?\u1F92) ;; GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F9B; F; 1F23 03B9; # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI + (?\u1F9B ?\u1F93) ;; GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F9C; F; 1F24 03B9; # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI + (?\u1F9C ?\u1F94) ;; GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F9D; F; 1F25 03B9; # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI + (?\u1F9D ?\u1F95) ;; GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F9E; F; 1F26 03B9; # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI + (?\u1F9E ?\u1F96) ;; GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1F9F; F; 1F27 03B9; # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI + (?\u1F9F ?\u1F97) ;; GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FA0; F; 1F60 03B9; # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FA1; F; 1F61 03B9; # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FA2; F; 1F62 03B9; # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FA3; F; 1F63 03B9; # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FA4; F; 1F64 03B9; # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FA5; F; 1F65 03B9; # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FA6; F; 1F66 03B9; # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FA7; F; 1F67 03B9; # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FA8; F; 1F60 03B9; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI + (?\u1FA8 ?\u1FA0) ;; GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FA9; F; 1F61 03B9; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI + (?\u1FA9 ?\u1FA1) ;; GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FAA; F; 1F62 03B9; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI + (?\u1FAA ?\u1FA2) ;; GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FAB; F; 1F63 03B9; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI + (?\u1FAB ?\u1FA3) ;; GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FAC; F; 1F64 03B9; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI + (?\u1FAC ?\u1FA4) ;; GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FAD; F; 1F65 03B9; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI + (?\u1FAD ?\u1FA5) ;; GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FAE; F; 1F66 03B9; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI + (?\u1FAE ?\u1FA6) ;; GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FAF; F; 1F67 03B9; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI + (?\u1FAF ?\u1FA7) ;; GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FB2; F; 1F70 03B9; # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FB3; F; 03B1 03B9; # GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FB4; F; 03AC 03B9; # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FB6; F; 03B1 0342; # GREEK SMALL LETTER ALPHA WITH PERISPOMENI +;;; WARNING: Unhandled full mapping: +;;; 1FB7; F; 03B1 0342 03B9; # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI + (?\u1FB8 ?\u1FB0) ;; GREEK CAPITAL LETTER ALPHA WITH VRACHY + (?\u1FB9 ?\u1FB1) ;; GREEK CAPITAL LETTER ALPHA WITH MACRON + (?\u1FBA ?\u1F70) ;; GREEK CAPITAL LETTER ALPHA WITH VARIA + (?\u1FBB ?\u1F71) ;; GREEK CAPITAL LETTER ALPHA WITH OXIA +;;; WARNING: Unhandled full mapping: +;;; 1FBC; F; 03B1 03B9; # GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI + (?\u1FBC ?\u1FB3) ;; GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI + (?\u1FBE ?\u03B9) ;; GREEK PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FC2; F; 1F74 03B9; # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FC3; F; 03B7 03B9; # GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FC4; F; 03AE 03B9; # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FC6; F; 03B7 0342; # GREEK SMALL LETTER ETA WITH PERISPOMENI +;;; WARNING: Unhandled full mapping: +;;; 1FC7; F; 03B7 0342 03B9; # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI + (?\u1FC8 ?\u1F72) ;; GREEK CAPITAL LETTER EPSILON WITH VARIA + (?\u1FC9 ?\u1F73) ;; GREEK CAPITAL LETTER EPSILON WITH OXIA + (?\u1FCA ?\u1F74) ;; GREEK CAPITAL LETTER ETA WITH VARIA + (?\u1FCB ?\u1F75) ;; GREEK CAPITAL LETTER ETA WITH OXIA +;;; WARNING: Unhandled full mapping: +;;; 1FCC; F; 03B7 03B9; # GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI + (?\u1FCC ?\u1FC3) ;; GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FD2; F; 03B9 0308 0300; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA +;;; WARNING: Unhandled full mapping: +;;; 1FD3; F; 03B9 0308 0301; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA +;;; WARNING: Unhandled full mapping: +;;; 1FD6; F; 03B9 0342; # GREEK SMALL LETTER IOTA WITH PERISPOMENI +;;; WARNING: Unhandled full mapping: +;;; 1FD7; F; 03B9 0308 0342; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI + (?\u1FD8 ?\u1FD0) ;; GREEK CAPITAL LETTER IOTA WITH VRACHY + (?\u1FD9 ?\u1FD1) ;; GREEK CAPITAL LETTER IOTA WITH MACRON + (?\u1FDA ?\u1F76) ;; GREEK CAPITAL LETTER IOTA WITH VARIA + (?\u1FDB ?\u1F77) ;; GREEK CAPITAL LETTER IOTA WITH OXIA +;;; WARNING: Unhandled full mapping: +;;; 1FE2; F; 03C5 0308 0300; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA +;;; WARNING: Unhandled full mapping: +;;; 1FE3; F; 03C5 0308 0301; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA +;;; WARNING: Unhandled full mapping: +;;; 1FE4; F; 03C1 0313; # GREEK SMALL LETTER RHO WITH PSILI +;;; WARNING: Unhandled full mapping: +;;; 1FE6; F; 03C5 0342; # GREEK SMALL LETTER UPSILON WITH PERISPOMENI +;;; WARNING: Unhandled full mapping: +;;; 1FE7; F; 03C5 0308 0342; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI + (?\u1FE8 ?\u1FE0) ;; GREEK CAPITAL LETTER UPSILON WITH VRACHY + (?\u1FE9 ?\u1FE1) ;; GREEK CAPITAL LETTER UPSILON WITH MACRON + (?\u1FEA ?\u1F7A) ;; GREEK CAPITAL LETTER UPSILON WITH VARIA + (?\u1FEB ?\u1F7B) ;; GREEK CAPITAL LETTER UPSILON WITH OXIA + (?\u1FEC ?\u1FE5) ;; GREEK CAPITAL LETTER RHO WITH DASIA +;;; WARNING: Unhandled full mapping: +;;; 1FF2; F; 1F7C 03B9; # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FF3; F; 03C9 03B9; # GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FF4; F; 03CE 03B9; # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI +;;; WARNING: Unhandled full mapping: +;;; 1FF6; F; 03C9 0342; # GREEK SMALL LETTER OMEGA WITH PERISPOMENI +;;; WARNING: Unhandled full mapping: +;;; 1FF7; F; 03C9 0342 03B9; # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI + (?\u1FF8 ?\u1F78) ;; GREEK CAPITAL LETTER OMICRON WITH VARIA + (?\u1FF9 ?\u1F79) ;; GREEK CAPITAL LETTER OMICRON WITH OXIA + (?\u1FFA ?\u1F7C) ;; GREEK CAPITAL LETTER OMEGA WITH VARIA + (?\u1FFB ?\u1F7D) ;; GREEK CAPITAL LETTER OMEGA WITH OXIA +;;; WARNING: Unhandled full mapping: +;;; 1FFC; F; 03C9 03B9; # GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI + (?\u1FFC ?\u1FF3) ;; GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI + (?\u2126 ?\u03C9) ;; OHM SIGN + (?\u212A ?\u006B) ;; KELVIN SIGN + (?\u212B ?\u00E5) ;; ANGSTROM SIGN + (?\u2132 ?\u214E) ;; TURNED CAPITAL F + (?\u2160 ?\u2170) ;; ROMAN NUMERAL ONE + (?\u2161 ?\u2171) ;; ROMAN NUMERAL TWO + (?\u2162 ?\u2172) ;; ROMAN NUMERAL THREE + (?\u2163 ?\u2173) ;; ROMAN NUMERAL FOUR + (?\u2164 ?\u2174) ;; ROMAN NUMERAL FIVE + (?\u2165 ?\u2175) ;; ROMAN NUMERAL SIX + (?\u2166 ?\u2176) ;; ROMAN NUMERAL SEVEN + (?\u2167 ?\u2177) ;; ROMAN NUMERAL EIGHT + (?\u2168 ?\u2178) ;; ROMAN NUMERAL NINE + (?\u2169 ?\u2179) ;; ROMAN NUMERAL TEN + (?\u216A ?\u217A) ;; ROMAN NUMERAL ELEVEN + (?\u216B ?\u217B) ;; ROMAN NUMERAL TWELVE + (?\u216C ?\u217C) ;; ROMAN NUMERAL FIFTY + (?\u216D ?\u217D) ;; ROMAN NUMERAL ONE HUNDRED + (?\u216E ?\u217E) ;; ROMAN NUMERAL FIVE HUNDRED + (?\u216F ?\u217F) ;; ROMAN NUMERAL ONE THOUSAND + (?\u2183 ?\u2184) ;; ROMAN NUMERAL REVERSED ONE HUNDRED + (?\u24B6 ?\u24D0) ;; CIRCLED LATIN CAPITAL LETTER A + (?\u24B7 ?\u24D1) ;; CIRCLED LATIN CAPITAL LETTER B + (?\u24B8 ?\u24D2) ;; CIRCLED LATIN CAPITAL LETTER C + (?\u24B9 ?\u24D3) ;; CIRCLED LATIN CAPITAL LETTER D + (?\u24BA ?\u24D4) ;; CIRCLED LATIN CAPITAL LETTER E + (?\u24BB ?\u24D5) ;; CIRCLED LATIN CAPITAL LETTER F + (?\u24BC ?\u24D6) ;; CIRCLED LATIN CAPITAL LETTER G + (?\u24BD ?\u24D7) ;; CIRCLED LATIN CAPITAL LETTER H + (?\u24BE ?\u24D8) ;; CIRCLED LATIN CAPITAL LETTER I + (?\u24BF ?\u24D9) ;; CIRCLED LATIN CAPITAL LETTER J + (?\u24C0 ?\u24DA) ;; CIRCLED LATIN CAPITAL LETTER K + (?\u24C1 ?\u24DB) ;; CIRCLED LATIN CAPITAL LETTER L + (?\u24C2 ?\u24DC) ;; CIRCLED LATIN CAPITAL LETTER M + (?\u24C3 ?\u24DD) ;; CIRCLED LATIN CAPITAL LETTER N + (?\u24C4 ?\u24DE) ;; CIRCLED LATIN CAPITAL LETTER O + (?\u24C5 ?\u24DF) ;; CIRCLED LATIN CAPITAL LETTER P + (?\u24C6 ?\u24E0) ;; CIRCLED LATIN CAPITAL LETTER Q + (?\u24C7 ?\u24E1) ;; CIRCLED LATIN CAPITAL LETTER R + (?\u24C8 ?\u24E2) ;; CIRCLED LATIN CAPITAL LETTER S + (?\u24C9 ?\u24E3) ;; CIRCLED LATIN CAPITAL LETTER T + (?\u24CA ?\u24E4) ;; CIRCLED LATIN CAPITAL LETTER U + (?\u24CB ?\u24E5) ;; CIRCLED LATIN CAPITAL LETTER V + (?\u24CC ?\u24E6) ;; CIRCLED LATIN CAPITAL LETTER W + (?\u24CD ?\u24E7) ;; CIRCLED LATIN CAPITAL LETTER X + (?\u24CE ?\u24E8) ;; CIRCLED LATIN CAPITAL LETTER Y + (?\u24CF ?\u24E9) ;; CIRCLED LATIN CAPITAL LETTER Z + (?\u2C00 ?\u2C30) ;; GLAGOLITIC CAPITAL LETTER AZU + (?\u2C01 ?\u2C31) ;; GLAGOLITIC CAPITAL LETTER BUKY + (?\u2C02 ?\u2C32) ;; GLAGOLITIC CAPITAL LETTER VEDE + (?\u2C03 ?\u2C33) ;; GLAGOLITIC CAPITAL LETTER GLAGOLI + (?\u2C04 ?\u2C34) ;; GLAGOLITIC CAPITAL LETTER DOBRO + (?\u2C05 ?\u2C35) ;; GLAGOLITIC CAPITAL LETTER YESTU + (?\u2C06 ?\u2C36) ;; GLAGOLITIC CAPITAL LETTER ZHIVETE + (?\u2C07 ?\u2C37) ;; GLAGOLITIC CAPITAL LETTER DZELO + (?\u2C08 ?\u2C38) ;; GLAGOLITIC CAPITAL LETTER ZEMLJA + (?\u2C09 ?\u2C39) ;; GLAGOLITIC CAPITAL LETTER IZHE + (?\u2C0A ?\u2C3A) ;; GLAGOLITIC CAPITAL LETTER INITIAL IZHE + (?\u2C0B ?\u2C3B) ;; GLAGOLITIC CAPITAL LETTER I + (?\u2C0C ?\u2C3C) ;; GLAGOLITIC CAPITAL LETTER DJERVI + (?\u2C0D ?\u2C3D) ;; GLAGOLITIC CAPITAL LETTER KAKO + (?\u2C0E ?\u2C3E) ;; GLAGOLITIC CAPITAL LETTER LJUDIJE + (?\u2C0F ?\u2C3F) ;; GLAGOLITIC CAPITAL LETTER MYSLITE + (?\u2C10 ?\u2C40) ;; GLAGOLITIC CAPITAL LETTER NASHI + (?\u2C11 ?\u2C41) ;; GLAGOLITIC CAPITAL LETTER ONU + (?\u2C12 ?\u2C42) ;; GLAGOLITIC CAPITAL LETTER POKOJI + (?\u2C13 ?\u2C43) ;; GLAGOLITIC CAPITAL LETTER RITSI + (?\u2C14 ?\u2C44) ;; GLAGOLITIC CAPITAL LETTER SLOVO + (?\u2C15 ?\u2C45) ;; GLAGOLITIC CAPITAL LETTER TVRIDO + (?\u2C16 ?\u2C46) ;; GLAGOLITIC CAPITAL LETTER UKU + (?\u2C17 ?\u2C47) ;; GLAGOLITIC CAPITAL LETTER FRITU + (?\u2C18 ?\u2C48) ;; GLAGOLITIC CAPITAL LETTER HERU + (?\u2C19 ?\u2C49) ;; GLAGOLITIC CAPITAL LETTER OTU + (?\u2C1A ?\u2C4A) ;; GLAGOLITIC CAPITAL LETTER PE + (?\u2C1B ?\u2C4B) ;; GLAGOLITIC CAPITAL LETTER SHTA + (?\u2C1C ?\u2C4C) ;; GLAGOLITIC CAPITAL LETTER TSI + (?\u2C1D ?\u2C4D) ;; GLAGOLITIC CAPITAL LETTER CHRIVI + (?\u2C1E ?\u2C4E) ;; GLAGOLITIC CAPITAL LETTER SHA + (?\u2C1F ?\u2C4F) ;; GLAGOLITIC CAPITAL LETTER YERU + (?\u2C20 ?\u2C50) ;; GLAGOLITIC CAPITAL LETTER YERI + (?\u2C21 ?\u2C51) ;; GLAGOLITIC CAPITAL LETTER YATI + (?\u2C22 ?\u2C52) ;; GLAGOLITIC CAPITAL LETTER SPIDERY HA + (?\u2C23 ?\u2C53) ;; GLAGOLITIC CAPITAL LETTER YU + (?\u2C24 ?\u2C54) ;; GLAGOLITIC CAPITAL LETTER SMALL YUS + (?\u2C25 ?\u2C55) ;; GLAGOLITIC CAPITAL LETTER SMALL YUS WITH TAIL + (?\u2C26 ?\u2C56) ;; GLAGOLITIC CAPITAL LETTER YO + (?\u2C27 ?\u2C57) ;; GLAGOLITIC CAPITAL LETTER IOTATED SMALL YUS + (?\u2C28 ?\u2C58) ;; GLAGOLITIC CAPITAL LETTER BIG YUS + (?\u2C29 ?\u2C59) ;; GLAGOLITIC CAPITAL LETTER IOTATED BIG YUS + (?\u2C2A ?\u2C5A) ;; GLAGOLITIC CAPITAL LETTER FITA + (?\u2C2B ?\u2C5B) ;; GLAGOLITIC CAPITAL LETTER IZHITSA + (?\u2C2C ?\u2C5C) ;; GLAGOLITIC CAPITAL LETTER SHTAPIC + (?\u2C2D ?\u2C5D) ;; GLAGOLITIC CAPITAL LETTER TROKUTASTI A + (?\u2C2E ?\u2C5E) ;; GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE + (?\u2C60 ?\u2C61) ;; LATIN CAPITAL LETTER L WITH DOUBLE BAR + (?\u2C62 ?\u026B) ;; LATIN CAPITAL LETTER L WITH MIDDLE TILDE + (?\u2C63 ?\u1D7D) ;; LATIN CAPITAL LETTER P WITH STROKE + (?\u2C64 ?\u027D) ;; LATIN CAPITAL LETTER R WITH TAIL + (?\u2C67 ?\u2C68) ;; LATIN CAPITAL LETTER H WITH DESCENDER + (?\u2C69 ?\u2C6A) ;; LATIN CAPITAL LETTER K WITH DESCENDER + (?\u2C6B ?\u2C6C) ;; LATIN CAPITAL LETTER Z WITH DESCENDER + (?\u2C6D ?\u0251) ;; LATIN CAPITAL LETTER ALPHA + (?\u2C6E ?\u0271) ;; LATIN CAPITAL LETTER M WITH HOOK + (?\u2C6F ?\u0250) ;; LATIN CAPITAL LETTER TURNED A + (?\u2C70 ?\u0252) ;; LATIN CAPITAL LETTER TURNED ALPHA + (?\u2C72 ?\u2C73) ;; LATIN CAPITAL LETTER W WITH HOOK + (?\u2C75 ?\u2C76) ;; LATIN CAPITAL LETTER HALF H + (?\u2C7E ?\u023F) ;; LATIN CAPITAL LETTER S WITH SWASH TAIL + (?\u2C7F ?\u0240) ;; LATIN CAPITAL LETTER Z WITH SWASH TAIL + (?\u2C80 ?\u2C81) ;; COPTIC CAPITAL LETTER ALFA + (?\u2C82 ?\u2C83) ;; COPTIC CAPITAL LETTER VIDA + (?\u2C84 ?\u2C85) ;; COPTIC CAPITAL LETTER GAMMA + (?\u2C86 ?\u2C87) ;; COPTIC CAPITAL LETTER DALDA + (?\u2C88 ?\u2C89) ;; COPTIC CAPITAL LETTER EIE + (?\u2C8A ?\u2C8B) ;; COPTIC CAPITAL LETTER SOU + (?\u2C8C ?\u2C8D) ;; COPTIC CAPITAL LETTER ZATA + (?\u2C8E ?\u2C8F) ;; COPTIC CAPITAL LETTER HATE + (?\u2C90 ?\u2C91) ;; COPTIC CAPITAL LETTER THETHE + (?\u2C92 ?\u2C93) ;; COPTIC CAPITAL LETTER IAUDA + (?\u2C94 ?\u2C95) ;; COPTIC CAPITAL LETTER KAPA + (?\u2C96 ?\u2C97) ;; COPTIC CAPITAL LETTER LAULA + (?\u2C98 ?\u2C99) ;; COPTIC CAPITAL LETTER MI + (?\u2C9A ?\u2C9B) ;; COPTIC CAPITAL LETTER NI + (?\u2C9C ?\u2C9D) ;; COPTIC CAPITAL LETTER KSI + (?\u2C9E ?\u2C9F) ;; COPTIC CAPITAL LETTER O + (?\u2CA0 ?\u2CA1) ;; COPTIC CAPITAL LETTER PI + (?\u2CA2 ?\u2CA3) ;; COPTIC CAPITAL LETTER RO + (?\u2CA4 ?\u2CA5) ;; COPTIC CAPITAL LETTER SIMA + (?\u2CA6 ?\u2CA7) ;; COPTIC CAPITAL LETTER TAU + (?\u2CA8 ?\u2CA9) ;; COPTIC CAPITAL LETTER UA + (?\u2CAA ?\u2CAB) ;; COPTIC CAPITAL LETTER FI + (?\u2CAC ?\u2CAD) ;; COPTIC CAPITAL LETTER KHI + (?\u2CAE ?\u2CAF) ;; COPTIC CAPITAL LETTER PSI + (?\u2CB0 ?\u2CB1) ;; COPTIC CAPITAL LETTER OOU + (?\u2CB2 ?\u2CB3) ;; COPTIC CAPITAL LETTER DIALECT-P ALEF + (?\u2CB4 ?\u2CB5) ;; COPTIC CAPITAL LETTER OLD COPTIC AIN + (?\u2CB6 ?\u2CB7) ;; COPTIC CAPITAL LETTER CRYPTOGRAMMIC EIE + (?\u2CB8 ?\u2CB9) ;; COPTIC CAPITAL LETTER DIALECT-P KAPA + (?\u2CBA ?\u2CBB) ;; COPTIC CAPITAL LETTER DIALECT-P NI + (?\u2CBC ?\u2CBD) ;; COPTIC CAPITAL LETTER CRYPTOGRAMMIC NI + (?\u2CBE ?\u2CBF) ;; COPTIC CAPITAL LETTER OLD COPTIC OOU + (?\u2CC0 ?\u2CC1) ;; COPTIC CAPITAL LETTER SAMPI + (?\u2CC2 ?\u2CC3) ;; COPTIC CAPITAL LETTER CROSSED SHEI + (?\u2CC4 ?\u2CC5) ;; COPTIC CAPITAL LETTER OLD COPTIC SHEI + (?\u2CC6 ?\u2CC7) ;; COPTIC CAPITAL LETTER OLD COPTIC ESH + (?\u2CC8 ?\u2CC9) ;; COPTIC CAPITAL LETTER AKHMIMIC KHEI + (?\u2CCA ?\u2CCB) ;; COPTIC CAPITAL LETTER DIALECT-P HORI + (?\u2CCC ?\u2CCD) ;; COPTIC CAPITAL LETTER OLD COPTIC HORI + (?\u2CCE ?\u2CCF) ;; COPTIC CAPITAL LETTER OLD COPTIC HA + (?\u2CD0 ?\u2CD1) ;; COPTIC CAPITAL LETTER L-SHAPED HA + (?\u2CD2 ?\u2CD3) ;; COPTIC CAPITAL LETTER OLD COPTIC HEI + (?\u2CD4 ?\u2CD5) ;; COPTIC CAPITAL LETTER OLD COPTIC HAT + (?\u2CD6 ?\u2CD7) ;; COPTIC CAPITAL LETTER OLD COPTIC GANGIA + (?\u2CD8 ?\u2CD9) ;; COPTIC CAPITAL LETTER OLD COPTIC DJA + (?\u2CDA ?\u2CDB) ;; COPTIC CAPITAL LETTER OLD COPTIC SHIMA + (?\u2CDC ?\u2CDD) ;; COPTIC CAPITAL LETTER OLD NUBIAN SHIMA + (?\u2CDE ?\u2CDF) ;; COPTIC CAPITAL LETTER OLD NUBIAN NGI + (?\u2CE0 ?\u2CE1) ;; COPTIC CAPITAL LETTER OLD NUBIAN NYI + (?\u2CE2 ?\u2CE3) ;; COPTIC CAPITAL LETTER OLD NUBIAN WAU + (?\u2CEB ?\u2CEC) ;; COPTIC CAPITAL LETTER CRYPTOGRAMMIC SHEI + (?\u2CED ?\u2CEE) ;; COPTIC CAPITAL LETTER CRYPTOGRAMMIC GANGIA + (?\uA640 ?\uA641) ;; CYRILLIC CAPITAL LETTER ZEMLYA + (?\uA642 ?\uA643) ;; CYRILLIC CAPITAL LETTER DZELO + (?\uA644 ?\uA645) ;; CYRILLIC CAPITAL LETTER REVERSED DZE + (?\uA646 ?\uA647) ;; CYRILLIC CAPITAL LETTER IOTA + (?\uA648 ?\uA649) ;; CYRILLIC CAPITAL LETTER DJERV + (?\uA64A ?\uA64B) ;; CYRILLIC CAPITAL LETTER MONOGRAPH UK + (?\uA64C ?\uA64D) ;; CYRILLIC CAPITAL LETTER BROAD OMEGA + (?\uA64E ?\uA64F) ;; CYRILLIC CAPITAL LETTER NEUTRAL YER + (?\uA650 ?\uA651) ;; CYRILLIC CAPITAL LETTER YERU WITH BACK YER + (?\uA652 ?\uA653) ;; CYRILLIC CAPITAL LETTER IOTIFIED YAT + (?\uA654 ?\uA655) ;; CYRILLIC CAPITAL LETTER REVERSED YU + (?\uA656 ?\uA657) ;; CYRILLIC CAPITAL LETTER IOTIFIED A + (?\uA658 ?\uA659) ;; CYRILLIC CAPITAL LETTER CLOSED LITTLE YUS + (?\uA65A ?\uA65B) ;; CYRILLIC CAPITAL LETTER BLENDED YUS + (?\uA65C ?\uA65D) ;; CYRILLIC CAPITAL LETTER IOTIFIED CLOSED LITTLE YUS + (?\uA65E ?\uA65F) ;; CYRILLIC CAPITAL LETTER YN + (?\uA662 ?\uA663) ;; CYRILLIC CAPITAL LETTER SOFT DE + (?\uA664 ?\uA665) ;; CYRILLIC CAPITAL LETTER SOFT EL + (?\uA666 ?\uA667) ;; CYRILLIC CAPITAL LETTER SOFT EM + (?\uA668 ?\uA669) ;; CYRILLIC CAPITAL LETTER MONOCULAR O + (?\uA66A ?\uA66B) ;; CYRILLIC CAPITAL LETTER BINOCULAR O + (?\uA66C ?\uA66D) ;; CYRILLIC CAPITAL LETTER DOUBLE MONOCULAR O + (?\uA680 ?\uA681) ;; CYRILLIC CAPITAL LETTER DWE + (?\uA682 ?\uA683) ;; CYRILLIC CAPITAL LETTER DZWE + (?\uA684 ?\uA685) ;; CYRILLIC CAPITAL LETTER ZHWE + (?\uA686 ?\uA687) ;; CYRILLIC CAPITAL LETTER CCHE + (?\uA688 ?\uA689) ;; CYRILLIC CAPITAL LETTER DZZE + (?\uA68A ?\uA68B) ;; CYRILLIC CAPITAL LETTER TE WITH MIDDLE HOOK + (?\uA68C ?\uA68D) ;; CYRILLIC CAPITAL LETTER TWE + (?\uA68E ?\uA68F) ;; CYRILLIC CAPITAL LETTER TSWE + (?\uA690 ?\uA691) ;; CYRILLIC CAPITAL LETTER TSSE + (?\uA692 ?\uA693) ;; CYRILLIC CAPITAL LETTER TCHE + (?\uA694 ?\uA695) ;; CYRILLIC CAPITAL LETTER HWE + (?\uA696 ?\uA697) ;; CYRILLIC CAPITAL LETTER SHWE + (?\uA722 ?\uA723) ;; LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF + (?\uA724 ?\uA725) ;; LATIN CAPITAL LETTER EGYPTOLOGICAL AIN + (?\uA726 ?\uA727) ;; LATIN CAPITAL LETTER HENG + (?\uA728 ?\uA729) ;; LATIN CAPITAL LETTER TZ + (?\uA72A ?\uA72B) ;; LATIN CAPITAL LETTER TRESILLO + (?\uA72C ?\uA72D) ;; LATIN CAPITAL LETTER CUATRILLO + (?\uA72E ?\uA72F) ;; LATIN CAPITAL LETTER CUATRILLO WITH COMMA + (?\uA732 ?\uA733) ;; LATIN CAPITAL LETTER AA + (?\uA734 ?\uA735) ;; LATIN CAPITAL LETTER AO + (?\uA736 ?\uA737) ;; LATIN CAPITAL LETTER AU + (?\uA738 ?\uA739) ;; LATIN CAPITAL LETTER AV + (?\uA73A ?\uA73B) ;; LATIN CAPITAL LETTER AV WITH HORIZONTAL BAR + (?\uA73C ?\uA73D) ;; LATIN CAPITAL LETTER AY + (?\uA73E ?\uA73F) ;; LATIN CAPITAL LETTER REVERSED C WITH DOT + (?\uA740 ?\uA741) ;; LATIN CAPITAL LETTER K WITH STROKE + (?\uA742 ?\uA743) ;; LATIN CAPITAL LETTER K WITH DIAGONAL STROKE + (?\uA744 ?\uA745) ;; LATIN CAPITAL LETTER K WITH STROKE AND DIAGONAL STROKE + (?\uA746 ?\uA747) ;; LATIN CAPITAL LETTER BROKEN L + (?\uA748 ?\uA749) ;; LATIN CAPITAL LETTER L WITH HIGH STROKE + (?\uA74A ?\uA74B) ;; LATIN CAPITAL LETTER O WITH LONG STROKE OVERLAY + (?\uA74C ?\uA74D) ;; LATIN CAPITAL LETTER O WITH LOOP + (?\uA74E ?\uA74F) ;; LATIN CAPITAL LETTER OO + (?\uA750 ?\uA751) ;; LATIN CAPITAL LETTER P WITH STROKE THROUGH DESCENDER + (?\uA752 ?\uA753) ;; LATIN CAPITAL LETTER P WITH FLOURISH + (?\uA754 ?\uA755) ;; LATIN CAPITAL LETTER P WITH SQUIRREL TAIL + (?\uA756 ?\uA757) ;; LATIN CAPITAL LETTER Q WITH STROKE THROUGH DESCENDER + (?\uA758 ?\uA759) ;; LATIN CAPITAL LETTER Q WITH DIAGONAL STROKE + (?\uA75A ?\uA75B) ;; LATIN CAPITAL LETTER R ROTUNDA + (?\uA75C ?\uA75D) ;; LATIN CAPITAL LETTER RUM ROTUNDA + (?\uA75E ?\uA75F) ;; LATIN CAPITAL LETTER V WITH DIAGONAL STROKE + (?\uA760 ?\uA761) ;; LATIN CAPITAL LETTER VY + (?\uA762 ?\uA763) ;; LATIN CAPITAL LETTER VISIGOTHIC Z + (?\uA764 ?\uA765) ;; LATIN CAPITAL LETTER THORN WITH STROKE + (?\uA766 ?\uA767) ;; LATIN CAPITAL LETTER THORN WITH STROKE THROUGH DESCENDER + (?\uA768 ?\uA769) ;; LATIN CAPITAL LETTER VEND + (?\uA76A ?\uA76B) ;; LATIN CAPITAL LETTER ET + (?\uA76C ?\uA76D) ;; LATIN CAPITAL LETTER IS + (?\uA76E ?\uA76F) ;; LATIN CAPITAL LETTER CON + (?\uA779 ?\uA77A) ;; LATIN CAPITAL LETTER INSULAR D + (?\uA77B ?\uA77C) ;; LATIN CAPITAL LETTER INSULAR F + (?\uA77D ?\u1D79) ;; LATIN CAPITAL LETTER INSULAR G + (?\uA77E ?\uA77F) ;; LATIN CAPITAL LETTER TURNED INSULAR G + (?\uA780 ?\uA781) ;; LATIN CAPITAL LETTER TURNED L + (?\uA782 ?\uA783) ;; LATIN CAPITAL LETTER INSULAR R + (?\uA784 ?\uA785) ;; LATIN CAPITAL LETTER INSULAR S + (?\uA786 ?\uA787) ;; LATIN CAPITAL LETTER INSULAR T + (?\uA78B ?\uA78C) ;; LATIN CAPITAL LETTER SALTILLO +;;; WARNING: Unhandled full mapping: +;;; FB00; F; 0066 0066; # LATIN SMALL LIGATURE FF +;;; WARNING: Unhandled full mapping: +;;; FB01; F; 0066 0069; # LATIN SMALL LIGATURE FI +;;; WARNING: Unhandled full mapping: +;;; FB02; F; 0066 006C; # LATIN SMALL LIGATURE FL +;;; WARNING: Unhandled full mapping: +;;; FB03; F; 0066 0066 0069; # LATIN SMALL LIGATURE FFI +;;; WARNING: Unhandled full mapping: +;;; FB04; F; 0066 0066 006C; # LATIN SMALL LIGATURE FFL +;;; WARNING: Unhandled full mapping: +;;; FB05; F; 0073 0074; # LATIN SMALL LIGATURE LONG S T +;;; WARNING: Unhandled full mapping: +;;; FB06; F; 0073 0074; # LATIN SMALL LIGATURE ST +;;; WARNING: Unhandled full mapping: +;;; FB13; F; 0574 0576; # ARMENIAN SMALL LIGATURE MEN NOW +;;; WARNING: Unhandled full mapping: +;;; FB14; F; 0574 0565; # ARMENIAN SMALL LIGATURE MEN ECH +;;; WARNING: Unhandled full mapping: +;;; FB15; F; 0574 056B; # ARMENIAN SMALL LIGATURE MEN INI +;;; WARNING: Unhandled full mapping: +;;; FB16; F; 057E 0576; # ARMENIAN SMALL LIGATURE VEW NOW +;;; WARNING: Unhandled full mapping: +;;; FB17; F; 0574 056D; # ARMENIAN SMALL LIGATURE MEN XEH + (?\uFF21 ?\uFF41) ;; FULLWIDTH LATIN CAPITAL LETTER A + (?\uFF22 ?\uFF42) ;; FULLWIDTH LATIN CAPITAL LETTER B + (?\uFF23 ?\uFF43) ;; FULLWIDTH LATIN CAPITAL LETTER C + (?\uFF24 ?\uFF44) ;; FULLWIDTH LATIN CAPITAL LETTER D + (?\uFF25 ?\uFF45) ;; FULLWIDTH LATIN CAPITAL LETTER E + (?\uFF26 ?\uFF46) ;; FULLWIDTH LATIN CAPITAL LETTER F + (?\uFF27 ?\uFF47) ;; FULLWIDTH LATIN CAPITAL LETTER G + (?\uFF28 ?\uFF48) ;; FULLWIDTH LATIN CAPITAL LETTER H + (?\uFF29 ?\uFF49) ;; FULLWIDTH LATIN CAPITAL LETTER I + (?\uFF2A ?\uFF4A) ;; FULLWIDTH LATIN CAPITAL LETTER J + (?\uFF2B ?\uFF4B) ;; FULLWIDTH LATIN CAPITAL LETTER K + (?\uFF2C ?\uFF4C) ;; FULLWIDTH LATIN CAPITAL LETTER L + (?\uFF2D ?\uFF4D) ;; FULLWIDTH LATIN CAPITAL LETTER M + (?\uFF2E ?\uFF4E) ;; FULLWIDTH LATIN CAPITAL LETTER N + (?\uFF2F ?\uFF4F) ;; FULLWIDTH LATIN CAPITAL LETTER O + (?\uFF30 ?\uFF50) ;; FULLWIDTH LATIN CAPITAL LETTER P + (?\uFF31 ?\uFF51) ;; FULLWIDTH LATIN CAPITAL LETTER Q + (?\uFF32 ?\uFF52) ;; FULLWIDTH LATIN CAPITAL LETTER R + (?\uFF33 ?\uFF53) ;; FULLWIDTH LATIN CAPITAL LETTER S + (?\uFF34 ?\uFF54) ;; FULLWIDTH LATIN CAPITAL LETTER T + (?\uFF35 ?\uFF55) ;; FULLWIDTH LATIN CAPITAL LETTER U + (?\uFF36 ?\uFF56) ;; FULLWIDTH LATIN CAPITAL LETTER V + (?\uFF37 ?\uFF57) ;; FULLWIDTH LATIN CAPITAL LETTER W + (?\uFF38 ?\uFF58) ;; FULLWIDTH LATIN CAPITAL LETTER X + (?\uFF39 ?\uFF59) ;; FULLWIDTH LATIN CAPITAL LETTER Y + (?\uFF3A ?\uFF5A) ;; FULLWIDTH LATIN CAPITAL LETTER Z + (?\U00010400 ?\U00010428) ;; DESERET CAPITAL LETTER LONG I + (?\U00010401 ?\U00010429) ;; DESERET CAPITAL LETTER LONG E + (?\U00010402 ?\U0001042A) ;; DESERET CAPITAL LETTER LONG A + (?\U00010403 ?\U0001042B) ;; DESERET CAPITAL LETTER LONG AH + (?\U00010404 ?\U0001042C) ;; DESERET CAPITAL LETTER LONG O + (?\U00010405 ?\U0001042D) ;; DESERET CAPITAL LETTER LONG OO + (?\U00010406 ?\U0001042E) ;; DESERET CAPITAL LETTER SHORT I + (?\U00010407 ?\U0001042F) ;; DESERET CAPITAL LETTER SHORT E + (?\U00010408 ?\U00010430) ;; DESERET CAPITAL LETTER SHORT A + (?\U00010409 ?\U00010431) ;; DESERET CAPITAL LETTER SHORT AH + (?\U0001040A ?\U00010432) ;; DESERET CAPITAL LETTER SHORT O + (?\U0001040B ?\U00010433) ;; DESERET CAPITAL LETTER SHORT OO + (?\U0001040C ?\U00010434) ;; DESERET CAPITAL LETTER AY + (?\U0001040D ?\U00010435) ;; DESERET CAPITAL LETTER OW + (?\U0001040E ?\U00010436) ;; DESERET CAPITAL LETTER WU + (?\U0001040F ?\U00010437) ;; DESERET CAPITAL LETTER YEE + (?\U00010410 ?\U00010438) ;; DESERET CAPITAL LETTER H + (?\U00010411 ?\U00010439) ;; DESERET CAPITAL LETTER PEE + (?\U00010412 ?\U0001043A) ;; DESERET CAPITAL LETTER BEE + (?\U00010413 ?\U0001043B) ;; DESERET CAPITAL LETTER TEE + (?\U00010414 ?\U0001043C) ;; DESERET CAPITAL LETTER DEE + (?\U00010415 ?\U0001043D) ;; DESERET CAPITAL LETTER CHEE + (?\U00010416 ?\U0001043E) ;; DESERET CAPITAL LETTER JEE + (?\U00010417 ?\U0001043F) ;; DESERET CAPITAL LETTER KAY + (?\U00010418 ?\U00010440) ;; DESERET CAPITAL LETTER GAY + (?\U00010419 ?\U00010441) ;; DESERET CAPITAL LETTER EF + (?\U0001041A ?\U00010442) ;; DESERET CAPITAL LETTER VEE + (?\U0001041B ?\U00010443) ;; DESERET CAPITAL LETTER ETH + (?\U0001041C ?\U00010444) ;; DESERET CAPITAL LETTER THEE + (?\U0001041D ?\U00010445) ;; DESERET CAPITAL LETTER ES + (?\U0001041E ?\U00010446) ;; DESERET CAPITAL LETTER ZEE + (?\U0001041F ?\U00010447) ;; DESERET CAPITAL LETTER ESH + (?\U00010420 ?\U00010448) ;; DESERET CAPITAL LETTER ZHEE + (?\U00010421 ?\U00010449) ;; DESERET CAPITAL LETTER ER + (?\U00010422 ?\U0001044A) ;; DESERET CAPITAL LETTER EL + (?\U00010423 ?\U0001044B) ;; DESERET CAPITAL LETTER EM + (?\U00010424 ?\U0001044C) ;; DESERET CAPITAL LETTER EN + (?\U00010425 ?\U0001044D) ;; DESERET CAPITAL LETTER ENG + (?\U00010426 ?\U0001044E) ;; DESERET CAPITAL LETTER OI + (?\U00010427 ?\U0001044F) ;; DESERET CAPITAL LETTER EW + )) + (uni-casetab (loop + with case-table = (make-case-table) + for (uc lc) in uni-mappings + do (put-case-table-pair uc lc case-table) + finally return case-table)) + ;; All lowercase + (lower (with-output-to-string + (loop for (uc lc) in uni-mappings do (princ lc)))) + ;; All uppercase + (upper (with-output-to-string + (loop for (uc lc) in uni-mappings do (princ lc)))) + ;; For each pair, lower followed by upper + (lowerupper (with-output-to-string + (loop for (uc lc) in uni-mappings + do (princ lc) (princ uc)))) + ;; For each pair, upper followed by lower + (upperlower (with-output-to-string + (loop for (uc lc) in uni-mappings + do (princ uc) (princ lc)))) + ) + (with-case-table uni-casetab + (Assert-equalp lower upper) + (Assert-equalp lowerupper upperlower) + (Assert-equal lower (downcase upper)) + (Assert-equal upper (downcase lower)) + (Assert-equal lower (downcase upper)) + (Assert-equal upper (downcase lower)) + (Assert-equal (downcase lower) (downcase (downcase lower))) + (Assert-equal (upcase lowerupper) (upcase upperlower)) + (Assert-equal (downcase lowerupper) (downcase upperlower)) + (with-temp-buffer + (set-case-table uni-casetab) + (loop for (str1 str2) in `((,lower ,upper) + (,lowerupper ,upperlower) + (,upper ,lower) + (,upperlower ,lowerupper)) + do + (erase-buffer) + (Assert= (point-min) 1) + (Assert= (point) 1) + (insert str1) + (let ((point (point)) + (case-fold-search t)) + (Assert= (length str1) (1- point)) + (goto-char (point-min)) + (Assert-eql (search-forward str2 nil t) point))) + (loop for (uc lc) in uni-mappings do + (loop for (ch1 ch2) in `((,uc ,lc) + (,lc ,uc)) + do + (erase-buffer) + (insert ?a) + (insert ch1) + (insert ?b) + (goto-char (point-min)) + (Assert-eql (search-forward (char-to-string ch2) nil t) 3 + (format "Case-folded searching doesn't equate %s and %s" + (char-as-unicode-escape ch1) + (char-as-unicode-escape ch2))))))))
--- a/tests/automated/lisp-tests.el Mon Jan 18 08:44:49 2010 -0600 +++ b/tests/automated/lisp-tests.el Fri Jan 29 15:06:36 2010 -0600 @@ -2181,4 +2181,52 @@ do (Assert (functionp real-function) (format "checking %S is a function" real-function))) +;; #'member, #'assoc tests. + +(when (featurep 'bignum) + (let* ((member*-list `(0 9 342 [hi there] ,(1+ most-positive-fixnum) 0 + 0.0 ,(1- most-negative-fixnum) nil)) + (assoc*-list (loop + for elt in member*-list + collect (cons elt (random)))) + (hashing (make-hash-table :test 'eql)) + hashed-bignum) + (macrolet + ((1+most-positive-fixnum () + (1+ most-positive-fixnum)) + (1-most-negative-fixnum () + (1- most-negative-fixnum)) + (*-2-most-positive-fixnum () + (* 2 most-positive-fixnum))) + (Assert-eq + (member* (1+ most-positive-fixnum) member*-list) + (member* (1+ most-positive-fixnum) member*-list :test #'eql) + "checking #'member* correct if #'eql not explicitly specified") + (Assert-eq + (assoc* (1+ most-positive-fixnum) assoc*-list) + (assoc* (1+ most-positive-fixnum) assoc*-list :test #'eql) + "checking #'assoc* correct if #'eql not explicitly specified") + (Assert-eq + (rassoc* (1- most-negative-fixnum) assoc*-list) + (rassoc* (1- most-negative-fixnum) assoc*-list :test #'eql) + "checking #'rassoc* correct if #'eql not explicitly specified") + (Assert-eq + (eql (1+most-positive-fixnum) (1+ most-positive-fixnum)) + t + "checking #'eql handles a bignum literal properly.") + (Assert-eq + (member* (1+most-positive-fixnum) member*-list) + (member* (1+ most-positive-fixnum) member*-list :test #'equal) + "checking #'member* compiler macro correct with literal bignum") + (Assert-eq + (assoc* (1+most-positive-fixnum) assoc*-list) + (assoc* (1+ most-positive-fixnum) assoc*-list :test #'equal) + "checking #'assoc* compiler macro correct with literal bignum") + (puthash (setq hashed-bignum (*-2-most-positive-fixnum)) + (gensym) hashing) + (Assert-eq + (gethash (* 2 most-positive-fixnum) hashing) + (gethash hashed-bignum hashing) + "checking hashing works correctly with #'eql tests and bignums")))) + ;;; end of lisp-tests.el
--- a/tests/automated/mule-tests.el Mon Jan 18 08:44:49 2010 -0600 +++ b/tests/automated/mule-tests.el Fri Jan 29 15:06:36 2010 -0600 @@ -551,25 +551,23 @@ ;;--------------------------------------------------------------- (with-temp-buffer (insert-file-contents (locate-data-file "HELLO")) - (Assert-equal - ;; The sort is to make the algorithm of charsets-in-region - ;; irrelevant. - (sort (charsets-in-region (point-min) (point-max)) - #'string<) - '(ascii chinese-big5-1 chinese-gb2312 cyrillic-iso8859-5 - ethiopic greek-iso8859-7 hebrew-iso8859-8 japanese-jisx0208 - japanese-jisx0212 jit-ucs-charset-0 katakana-jisx0201 - korean-ksc5601 latin-iso8859-1 latin-iso8859-2 thai-xtis - vietnamese-viscii-lower)) - (Assert-equal - (sort (charsets-in-string (buffer-substring (point-min) - (point-max))) - #'string<) - '(ascii chinese-big5-1 chinese-gb2312 cyrillic-iso8859-5 - ethiopic greek-iso8859-7 hebrew-iso8859-8 japanese-jisx0208 - japanese-jisx0212 jit-ucs-charset-0 katakana-jisx0201 - korean-ksc5601 latin-iso8859-1 latin-iso8859-2 thai-xtis - vietnamese-viscii-lower))) + (let ((sorted-charsets-in-HELLO + '(arabic-iso8859-6 ascii chinese-big5-1 chinese-gb2312 + cyrillic-iso8859-5 ethiopic greek-iso8859-7 + hebrew-iso8859-8 japanese-jisx0208 japanese-jisx0212 + katakana-jisx0201 korean-ksc5601 latin-iso8859-1 + latin-iso8859-2 vietnamese-viscii-lower))) + (Assert-equal + ;; The sort is to make the algorithm of charsets-in-region + ;; irrelevant. + (sort (charsets-in-region (point-min) (point-max)) + #'string<) + sorted-charsets-in-HELLO) + (Assert-equal + (sort (charsets-in-string (buffer-substring (point-min) + (point-max))) + #'string<) + sorted-charsets-in-HELLO))) ;;--------------------------------------------------------------- ;; Language environments, and whether the specified values are sane.
--- a/tests/automated/test-harness.el Mon Jan 18 08:44:49 2010 -0600 +++ b/tests/automated/test-harness.el Fri Jan 29 15:06:36 2010 -0600 @@ -209,12 +209,20 @@ (defconst test-harness-failure-tag "FAIL") (defconst test-harness-success-tag "PASS") +;;;;; BEGIN DEFINITION OF MACROS USEFUL IN TEST CODE + (defmacro Known-Bug-Expect-Failure (&rest body) + "Wrap a BODY that consists of tests that are known to fail. +This causes messages to be printed on failure indicating that this is expected, +and on success indicating that this is unexpected." `(let ((test-harness-failure-tag "KNOWN BUG") (test-harness-success-tag "PASS (FAILURE EXPECTED)")) ,@body)) (defmacro Known-Bug-Expect-Error (expected-error &rest body) + "Wrap a BODY that consists of tests that are known to trigger an error. +This causes messages to be printed on failure indicating that this is expected, +and on success indicating that this is unexpected." (let ((quoted-body (if (= 1 (length body)) `(quote ,(car body)) `(quote (progn ,@body))))) `(let ((test-harness-failure-tag "KNOWN BUG") @@ -237,6 +245,10 @@ (incf wrong-error-failures)))))) (defmacro Implementation-Incomplete-Expect-Failure (&rest body) + "Wrap a BODY containing tests that are known to fail due to incomplete code. +This causes messages to be printed on failure indicating that the +implementation is incomplete (and hence the failure is expected); and on +success indicating that this is unexpected." `(let ((test-harness-failure-tag "IMPLEMENTATION INCOMPLETE") (test-harness-success-tag "PASS (FAILURE EXPECTED)")) ,@body)) @@ -293,17 +305,42 @@ (incf other-failures) )))) +;;;;; BEGIN DEFINITION OF SPECIFIC KINDS OF ASSERT MACROS + (defmacro Assert-test (test testval expected &optional failing-case description) - "Test passes if TESTVAL is equal to EXPECTED, using TEST as comparator. -TEST should be a function such as `eq', `equal', `equalp', `=', `<=', etc. -Optional FAILING-CASE describes the particular failure; any value given -here will be concatenated with a phrase describing the expected and actual -values of the comparison. Optional DESCRIPTION describes the assertion; by -default, the unevalated comparison expressions are given. FAILING-CASE and -DESCRIPTION are useful when Assert is used in a loop." + "Test passes if TESTVAL compares correctly to EXPECTED using TEST. +TEST should be a two-argument predicate (i.e. a function of two arguments +that returns t or nil), such as `eq', `eql', `equal', `equalp', `=', `<=', +'>', 'file-newer-than-file-p' etc. Optional FAILING-CASE describes the +particular failure; any value given here will be concatenated with a phrase +describing the expected and actual values of the comparison. Optional +DESCRIPTION describes the assertion; by default, the unevalated comparison +expressions are given. FAILING-CASE and DESCRIPTION are useful when Assert +is used in a loop." (let* ((assertion `(,test ,testval ,expected)) - (failmsg `(format "expected %S, got %S" ,expected ,testval)) + (failmsg `(format "%S should be `%s' to %S but isn't" + ,testval ',test ,expected)) + (failmsg2 (if failing-case `(concat + (format "%S, " ,failing-case) + ,failmsg) + failmsg))) + `(Assert ,assertion ,failmsg2 ,description))) + + (defmacro Assert-test-not (test testval expected &optional failing-case + description) + "Test passes if TESTVAL does not compare correctly to EXPECTED using TEST. +TEST should be a two-argument predicate (i.e. a function of two arguments +that returns t or nil), such as `eq', `eql', `equal', `equalp', `=', `<=', +'>', 'file-newer-than-file-p' etc. Optional FAILING-CASE describes the +particular failure; any value given here will be concatenated with a phrase +describing the expected and actual values of the comparison. Optional +DESCRIPTION describes the assertion; by default, the unevalated comparison +expressions are given. FAILING-CASE and DESCRIPTION are useful when Assert +is used in a loop." + (let* ((assertion `(,test ,testval ,expected)) + (failmsg `(format "%S shouldn't be `%s' to %S but is" + ,testval ',test ,expected)) (failmsg2 (if failing-case `(concat (format "%S, " ,failing-case) ,failmsg)