@code{scm_t_wchar} is a signed, 32-bit integer.
@end deftypefn
+Characters also have ``formal names'', which are defined by Unicode.
+These names can be accessed in Guile from the @code{(ice-9 unicode)}
+module:
+
+@example
+(use-modules (ice-9 unicode))
+@end example
+
+@deffn {Scheme Procedure} char->formal-name chr
+Return the formal all-upper-case Unicode name of @var{ch},
+as a string, or @code{#f} if the character has no name.
+@end deffn
+
+@deffn {Scheme Procedure} formal-name->char name
+Return the character whose formal all-upper-case Unicode name is
+@var{name}, or @code{#f} if no such character is known.
+@end deffn
+
@node Character Sets
@subsection Character Sets
threads.c \
throw.c \
trees.c \
+ unicode.c \
uniform.c \
values.c \
variable.c \
threads.x \
throw.x \
trees.x \
+ unicode.x \
uniform.x \
values.x \
variable.x \
threads.doc \
throw.doc \
trees.doc \
+ unicode.doc \
uniform.doc \
values.doc \
variable.doc \
throw.h \
trees.h \
validate.h \
+ unicode.h \
uniform.h \
values.h \
variable.h \
#include "libguile/throw.h"
#include "libguile/arrays.h"
#include "libguile/trees.h"
+#include "libguile/unicode.h"
#include "libguile/values.h"
#include "libguile/variable.h"
#include "libguile/vectors.h"
#endif
scm_bootstrap_i18n ();
scm_init_script ();
+ scm_init_unicode ();
scm_init_goops ();
--- /dev/null
+/* Copyright (C) 2014 Free Software Foundation, Inc.
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+\f
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <ctype.h>
+#include <limits.h>
+#include <unicase.h>
+#include <unictype.h>
+#include <uniname.h>
+
+#include "libguile/_scm.h"
+#include "libguile/validate.h"
+
+#include "libguile/unicode.h"
+
+\f
+
+SCM_DEFINE (scm_char_to_formal_name, "char->formal-name", 1, 0, 0,
+ (SCM ch),
+ "Return the formal all-upper-case unicode name of @var{ch},\n"
+ "as a string. If the character has no name, return @code{#f}.")
+#define FUNC_NAME s_scm_char_to_formal_name
+{
+ char buf[UNINAME_MAX + 1];
+
+ SCM_VALIDATE_CHAR (1, ch);
+
+ memset(buf, 0, UNINAME_MAX + 1);
+
+ if (unicode_character_name (SCM_CHAR (ch), buf))
+ return scm_from_latin1_string (buf);
+
+ return SCM_BOOL_F;
+}
+#undef FUNC_NAME
+
+SCM_DEFINE (scm_formal_name_to_char, "formal-name->char", 1, 0, 0,
+ (SCM name),
+ "Return the character whose formal all-upper-case unicode name is\n"
+ "@var{name}, or @code{#f} if no such character is known.")
+#define FUNC_NAME s_scm_formal_name_to_char
+{
+ char *c_name;
+ scm_t_wchar ret;
+
+ SCM_VALIDATE_STRING (1, name);
+
+ c_name = scm_to_latin1_string (name);
+ ret = unicode_name_character (c_name);
+ free (c_name);
+
+ return ret == UNINAME_INVALID ? SCM_BOOL_F : SCM_MAKE_CHAR (ret);
+}
+#undef FUNC_NAME
+
+static void
+scm_load_unicode (void)
+{
+#ifndef SCM_MAGIC_SNARFER
+#include "libguile/unicode.x"
+#endif
+}
+
+void
+scm_init_unicode (void)
+{
+ scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION,
+ "scm_init_unicode",
+ (scm_t_extension_init_func)scm_load_unicode,
+ NULL);
+}
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/
--- /dev/null
+/* classes: h_files */
+
+#ifndef SCM_UNICODE_H
+#define SCM_UNICODE_H
+
+/* Copyright (C) 2014 Free Software Foundation, Inc.
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+\f
+
+#include "libguile/__scm.h"
+
+SCM_INTERNAL SCM scm_formal_name_to_char (SCM);
+SCM_INTERNAL SCM scm_char_to_formal_name (SCM);
+SCM_INTERNAL void scm_init_unicode (void);
+
+#endif /* SCM_UNICODE_H */
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/
ice-9/weak-vector.scm \
ice-9/list.scm \
ice-9/serialize.scm \
- ice-9/local-eval.scm
+ ice-9/local-eval.scm \
+ ice-9/unicode.scm
srfi/srfi-64.go: srfi/srfi-64.scm srfi/srfi-64/testing.scm
--- /dev/null
+;; unicode
+
+;;;; Copyright (C) 2014 Free Software Foundation, Inc.
+;;;;
+;;;; This library is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU Lesser General Public License as
+;;;; published by the Free Software Foundation, either version 3 of the
+;;;; License, or (at your option) any later version.
+;;;;
+;;;; This library is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;;; GNU Lesser General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library. If not, see
+;;;; <http://www.gnu.org/licenses/>.
+;;;;
+
+(define-module (ice-9 unicode)
+ #:export (formal-name->char
+ char->formal-name))
+
+(eval-when (expand load eval)
+ (load-extension (string-append "libguile-" (effective-version))
+ "scm_init_unicode"))
tests/time.test \
tests/tree-il.test \
tests/types.test \
+ tests/unicode.test \
tests/version.test \
tests/vectors.test \
tests/vlist.test \
--- /dev/null
+;;;; unicode.test -*- scheme -*-
+;;;;
+;;;; Copyright (C) 2014 Free Software Foundation, Inc.
+;;;;
+;;;; This library is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU Lesser General Public License as
+;;;; published by the Free Software Foundation, either version 3 of the
+;;;; License, or (at your option) any later version.
+;;;;
+;;;; This library is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;;; GNU Lesser General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library. If not, see
+;;;; <http://www.gnu.org/licenses/>.
+;;;;
+
+(define-module (test-suite test-unicode)
+ #:use-module (test-suite lib)
+ #:use-module (ice-9 unicode))
+
+(pass-if-equal "LATIN SMALL LETTER A" (char->formal-name #\a))
+(pass-if-equal #\a (formal-name->char "LATIN SMALL LETTER A"))
+
+(pass-if-equal #f (char->formal-name #\nul))
+(pass-if-equal #f (formal-name->char "not a known formal name"))
HCoop / bpt / guile.git / commitdiff