summaryrefslogtreecommitdiff
path: root/doc/ref/api-data.texi
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-01-14 03:18:34 -0500
committerMark H Weaver <mhw@netris.org>2014-01-14 03:18:34 -0500
commitcb8aaef4d08989aea2b7f088d298f71a03ecc1b2 (patch)
tree4db2351d09ed63760f55c50ec4cc61a432fb3448 /doc/ref/api-data.texi
parentb958141cdb081ceb16ca5828abda71f772fe0c57 (diff)
parent0fc548287e154349f3365976e6a5854736b651ed (diff)
downloadguile-cb8aaef4d08989aea2b7f088d298f71a03ecc1b2.tar.gz
Merge branch 'stable-2.0'
Conflicts: libguile/chars.c libguile/read.c test-suite/tests/reader.test
Diffstat (limited to 'doc/ref/api-data.texi')
-rw-r--r--doc/ref/api-data.texi14
1 files changed, 11 insertions, 3 deletions
diff --git a/doc/ref/api-data.texi b/doc/ref/api-data.texi
index 59d7db075..1a3d2e873 100644
--- a/doc/ref/api-data.texi
+++ b/doc/ref/api-data.texi
@@ -56,6 +56,7 @@ For the documentation of such @dfn{compound} data types, see
@tpindex Booleans
The two boolean values are @code{#t} for true and @code{#f} for false.
+They can also be written as @code{#true} and @code{#false}, as per R7RS.
Boolean values are returned by predicate procedures, such as the general
equality predicates @code{eq?}, @code{eqv?} and @code{equal?}
@@ -2065,6 +2066,9 @@ name for each character.
The short name for the ``delete'' character (code point U+007F) is
@code{#\del}.
+The R7RS name for the ``escape'' character (code point U+001B) is
+@code{#\escape}.
+
There are also a few alternative names left over for compatibility with
previous versions of Guile.
@@ -2937,9 +2941,10 @@ The read syntax for strings is an arbitrarily long sequence of
characters enclosed in double quotes (@nicode{"}).
Backslash is an escape character and can be used to insert the following
-special characters. @nicode{\"} and @nicode{\\} are R5RS standard, the
-next seven are R6RS standard --- notice they follow C syntax --- and the
-remaining four are Guile extensions.
+special characters. @nicode{\"} and @nicode{\\} are R5RS standard,
+@nicode{\|} is R7RS standard, the next seven are R6RS standard ---
+notice they follow C syntax --- and the remaining four are Guile
+extensions.
@table @asis
@item @nicode{\\}
@@ -2949,6 +2954,9 @@ Backslash character.
Double quote character (an unescaped @nicode{"} is otherwise the end
of the string).
+@item @nicode{\|}
+Vertical bar character.
+
@item @nicode{\a}
Bell character (ASCII 7).