From 199b3d7f2aba8ca091bdf0bb026fa6a592c3f119 Mon Sep 17 00:00:00 2001 From: sperber Date: Mon, 17 Feb 2003 15:40:19 +0000 Subject: [PATCH] R4RS -> \RnRS R5RS -> \RnRS --- doc/scsh-manual/running.tex | 4 ++-- doc/scsh-manual/sre.tex | 6 +++--- doc/scsh-manual/strings.tex | 38 ++++++++++++++++++------------------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/doc/scsh-manual/running.tex b/doc/scsh-manual/running.tex index dd2639c..44db9f6 100644 --- a/doc/scsh-manual/running.tex +++ b/doc/scsh-manual/running.tex @@ -251,7 +251,7 @@ package; there are switches to change this package. Except where indicated, switches specify actions that are executed in a left-to-right order. The initial current package is the user package, which is completely -empty and opens (imports the bindings of) the R4RS and scsh structures. +empty and opens (imports the bindings of) the \RnRS{} and scsh structures. If the Scheme process is started up in an interactive mode, then the current package in force at the end of switch scanning is the one inside which @@ -282,7 +282,7 @@ The following switches and end options are defined: the new package is anonmyous, with no associated named structure. The new package initially opens no other structures, - not even the R4RS bindings. You must follow a ``\ex{-n foo}'' + not even the \RnRS{} bindings. You must follow a ``\ex{-n foo}'' switch with ``\ex{-o scheme}'' to access the standard identifiers such as \ex{car} and \ex{define}. diff --git a/doc/scsh-manual/sre.tex b/doc/scsh-manual/sre.tex index b2e87cb..5e95927 100644 --- a/doc/scsh-manual/sre.tex +++ b/doc/scsh-manual/sre.tex @@ -108,8 +108,8 @@ the next section is a friendlier tutorial introduction. integers. \\ \var{M} may also be \ex{\#f}, meaning ``infinity.''} \\ \\ -\ex{(| \var{sre} {\ldots})} & Choice (\ex{or} is R5RS symbol; \\ -\ex{(or \var{sre} {\ldots})} & \ex{|} is not specified by R5RS.) \\ +\ex{(| \var{sre} {\ldots})} & Choice (\ex{or} is \RnRS{} symbol; \\ +\ex{(or \var{sre} {\ldots})} & \ex{|} is not specified by \RnRS{}.) \\ \\ \ex{(: \var{sre} {\ldots})} & Sequence (\ex{seq} is legal \\ \ex{(seq \var{sre} {\ldots})} & Common Lisp symbol) \\ @@ -308,7 +308,7 @@ The regexp \ex{(seq \var{sre} \ldots)} is completely equivalent to \ex{(: \var{sre} \ldots)}; it's included in order to have a syntax that doesn't require \ex{:} to be a legal symbol \footnote{That is, for use within s-expression -syntax frameworks that, unlike R5RS, don't allow for \ex{:} as a legal symbol. +syntax frameworks that, unlike \RnRS, don't allow for \ex{:} as a legal symbol. A Common Lisp embedding of SREs, for example, would need to use \ex{seq} instead of \ex{:}.} diff --git a/doc/scsh-manual/strings.tex b/doc/scsh-manual/strings.tex index 5ea9ef7..3ab1355 100644 --- a/doc/scsh-manual/strings.tex +++ b/doc/scsh-manual/strings.tex @@ -153,11 +153,11 @@ which is both a directory (current working directory), and a file name \begin{tabular}{lll} File name & \ex{\ldots-directory?} & \ex{\ldots-non-directory?} \\ \hline -\ex{"src/des"} & \ex{\sharpf} & \ex{\sharpt} \\ +\ex{"src/des"} & \ex{\sharpf} & \ex{\sharpt} \\ \ex{"src/des/"} & \ex{\sharpt} & \ex{\sharpf} \\ -\ex{"/"} & \ex{\sharpt} & \ex{\sharpf} \\ -\ex{"."} & \ex{\sharpf} & \ex{\sharpt} \\ -\ex{""} & \ex{\sharpt} & \ex{\sharpt} +\ex{"/"} & \ex{\sharpt} & \ex{\sharpf} \\ +\ex{"."} & \ex{\sharpf} & \ex{\sharpt} \\ +\ex{""} & \ex{\sharpt} & \ex{\sharpt} \end{tabular} \end{center} \end{desc} @@ -444,11 +444,11 @@ is also frequently useful for expanding file-names. \begin{desc} Each of these predicates tests for membership in one of the standard character sets provided by the SRFI-14 character-set library. -Additionally, the following redundant bindings are provided for {R5RS} +Additionally, the following redundant bindings are provided for {\RnRS} compatibility: \begin{inset} \begin{tabular}{ll} - {R5RS} name & scsh definition \\ \hline + {\RnRS} name & scsh definition \\ \hline \ex{char-alphabetic?} & \ex{char-letter+digit?} \\ \ex{char-numeric?} & \ex{char-digit?} \\ \ex{char-alphanumeric?} & \ex{char-letter+digit?} @@ -474,22 +474,22 @@ the equivalent SRFI-13 binding. This obsolete library is deprecated and new code should use the SRFI-13 bindings. \begin{inset} \begin{tabular}{ll} - Old \ex{obsolete-char-set-lib} & SRFI-13 \ex{char-set-lib} \\ \hline + Old \ex{obsolete-char-set-lib} & SRFI-13 \ex{char-set-lib} \\ \hline - \ex{char-set-members} & \ex{char-set->list} \\ - \ex{chars->char-set} & \ex{list->char-set} \\ - \ex{ascii-range->char-set} & \ex{ucs-range->char-set} (not exact) \\ - \ex{predicate->char-set} & \ex{char-set-filter} (not exact) \\ - \ex{char-set-every}? & \ex{char-set-every} \\ - \ex{char-set-any}? & \ex{char-set-any} \\ + \ex{char-set-members} & \ex{char-set->list} \\ + \ex{chars->char-set} & \ex{list->char-set} \\ + \ex{ascii-range->char-set} & \ex{ucs-range->char-set} (not exact) \\ + \ex{predicate->char-set} & \ex{char-set-filter} (not exact) \\ + \ex{char-set-every}? & \ex{char-set-every} \\ + \ex{char-set-any}? & \ex{char-set-any} \\ \\ - \ex{char-set-invert} & \ex{char-set-complement} \\ - \ex{char-set-invert}! & \ex{char-set-complement!} \\ + \ex{char-set-invert} & \ex{char-set-complement} \\ + \ex{char-set-invert}! & \ex{char-set-complement!} \\ \\ - \ex{char-set:alphabetic} & \ex{char-set:letter} \\ - \ex{char-set:numeric} & \ex{char-set:digit} \\ - \ex{char-set:alphanumeric} & \ex{char-set:letter+digit} \\ - \ex{char-set:control} & \ex{char-set:iso-control} + \ex{char-set:alphabetic} & \ex{char-set:letter} \\ + \ex{char-set:numeric} & \ex{char-set:digit} \\ + \ex{char-set:alphanumeric} & \ex{char-set:letter+digit} \\ + \ex{char-set:control} & \ex{char-set:iso-control} \end{tabular} \end{inset} Note also that the \ex{->char-set} procedure no longer handles a predicate