Commit e8bf6f79 authored by pknaggs's avatar pknaggs
Browse files

Removed x:enhanced-locals markup

Minor revision to Data-type definition
Replaced F94 with F12
Added ISO Forth to list of references
Removed footnotes from references
parent 8a2c9401
Loading
Loading
Loading
Loading
+37 −51
Original line number Original line Diff line number Diff line
@@ -119,7 +119,7 @@ Depending on context, either
	\textbf{return stack}.
	\textbf{return stack}.


\item[data type:]
\item[data type:]
	Tn identifier for the set of values that a data object may have.
	\replace{ed12}{Tn}{An} identifier for the set of values that a data object may have.


\item[defining word:]
\item[defining word:]
	A Forth word that creates a new definition when executed.
	A Forth word that creates a new definition when executed.
@@ -259,35 +259,40 @@ Depending on context, either
\label{notations}
\label{notations}


% ---------- X:number-prefix ----------
% ---------- X:number-prefix ----------
\cbstart\patch{x:enhanced-locals}
The following notation is used to define the syntax of \replace{ed12}{various}{ some}
\uline{The following notation is used to define the syntax of various
elements within the document:
elements within the document:}


\begin{itemize}
\begin{itemize}
\item \uline{Each component of the element is defined with a rule consisting
\item Each component of the element is defined with a rule consisting
	of the name of the component (italicized in angle-brackets,
	of the name of the component (italicized in angle-brackets,
	e.g., \arg{decdigit}), the characters \textsf{:=} and a concatenation
	e.g., \arg{decdigit}), the characters \textsf{:=} and a concatenation
	of tokens and metacharacters;}
	of tokens and metacharacters;


\item \uline{Tokens may be literal characters (in bold face, e.g.,
\item Tokens may be literal characters (in bold face, e.g.,
	\textbf{E}) or rule names in angle brackets (e.g.,
	\textbf{E}) or rule names in angle brackets (e.g.,
	\linebreak \arg{decdigit});}
	\linebreak \arg{decdigit});


\item \uline{The metacharacter * is used to specify zero or more occurrences of
\item The metacharacter * is used to specify zero or more occurrences of
	the preceding token (e.g., \arg{decdigit}*);}
	the preceding token (e.g., \arg{decdigit}*);


\item \uline{Tokens enclosed with [ and ] are optional (e.g., [\textbf{-}]);}
\item Tokens enclosed with [ and ] are optional (e.g., [\textbf{-}]);


\item \uline{Vertical bars separate choices from a list of tokens enclosed
\item Vertical bars separate choices from a list of tokens enclosed
	with braces (e.g., \{ \textbf{0} {\textbar} \textbf{1} \}).}
	with braces (e.g., \{ \textbf{0} {\textbar} \textbf{1} \}).
\end{itemize}
\end{itemize}


\uline{See: \xref{usage:numbers},
\begin{list}{}{
	\xref{float:conv}, \linebreak
	\setlength{\labelwidth}{1.7em}		% <== Magic number, width of indent
	\setlength{\leftmargin}{\labelwidth}
	\addtolength{\leftmargin}{\labelsep}
}
\item[See:]
	\xref[3.4.1.3 Text interpreter input number conversion]{usage:numbers},
	\xref[12.3.7 Text interpreter input number conversion]{float:conv},
	\wref{floating:toFLOAT}{},
	\wref{floating:toFLOAT}{},
	\wref{floating:FSd}{FSd},
	\wref{floating:FSd}{FSd},
	\wref{local:b:}{}.}
	\wref{local:b:}{}.
\cbend
\end{list}


% --------------------
% --------------------


@@ -301,31 +306,6 @@ contents of an address is shown in double braces, particularly for
the contents of variables,
the contents of variables,
e.g., \word{BASE} \textbf{\{\{2 {\ldots} 36\}\}}.
e.g., \word{BASE} \textbf{\{\{2 {\ldots} 36\}\}}.


% ---------- X:number-prefix ----------
\cbstart\patch{x:enhanced-locals}
\sout{The following notation is used to define the syntax of the external
representation of numbers:}

\begin{itemize}
\item \sout{Each component of a number is defined with a rule consisting
	of the name of the component (italicized in angle-brackets,
	e.g., \arg{decdigit}), the characters \textsf{:=} and a concatenation
	of tokens and metacharacters;}

\item \sout{Tokens may be literal characters (in bold face, e.g.,
	\textbf{E}) or rule names in angle brackets (e.g.,
	\linebreak \arg{decdigit});}

\item \sout{The metacharacter * is used to specify zero or more occurrences of
	the preceding token (e.g., \arg{decdigit}*);}

\item \sout{Tokens enclosed with [ and ] are optional (e.g., [\textbf{-}]);}

\item \sout{Vertical bars separate choices from a list of tokens enclosed
	with braces (e.g., \{ \textbf{0} {\textbar} \textbf{1} \}).}
\end{itemize}
\cbend
% --------------------


\subsection{Stack notation}
\subsection{Stack notation}


@@ -392,9 +372,11 @@ parameters and the ``-{}-'' separator in the first stack described, e.g.,
\end{table}
\end{table}


\subsection{Glossary notation}
\subsection{Glossary notation}
\label{notation:glossary}


The glossary entries for each word set are listed in the standard
The glossary entries for each word set are listed in the standard
ASCII collating sequence. Each glossary entry specifies an \remove{F94}{ANS}
ASCII collating sequence. Each glossary entry specifies
\replace{ed12}{an}{ a}
Forth word and consists of two parts:
Forth word and consists of two parts:
an \emph{index line} and the \emph{semantic description} of the
an \emph{index line} and the \emph{semantic description} of the
definition.
definition.
@@ -453,26 +435,30 @@ remaining paragraphs contain a text description of the semantics.
See \xref[Semantics]{usage:semantics}.
See \xref[Semantics]{usage:semantics}.


\section{References}
\section{References}
\label{notation:references}


The following national and international standards are referenced
The following national and international standards are referenced
in this Standard:
in this Standard:


\begin{itemize}
\begin{itemize}
\item \place{F94}{ANSI X3.215-1994 \textit{Programming Languages -- Forth}.}
\item \place{ed12}{ISO/IEC 15145:1997 \emph{Information technology.
	Programming languages. FORTH}.}

\item ANSI X3.215-1994 \emph{Programming Languages -- Forth}.


\item ANSI X3.172-1990 \textit{Dictionary for Information Systems},
\item ANSI X3.172-1990 \emph{Dictionary for Information Systems},
	(\xref[Definition of terms]{notation:terms});
	(\xref[Definition of terms]{notation:terms});


\item ANSI X3.4-1974 \textit{American Standard Code for Information
\item ANSI X3.4-1974 \emph{American Standard Code for Information
	Interchange} (ASCII),
	Interchange} (ASCII),
	(\xref[Graphic characters]{usage:ASCII});
	(\xref[Graphic characters]{usage:ASCII});


\item ISO 646-1983 \textit{ISO 7-bit coded characterset for
\item ISO 646-1983 \emph{ISO 7-bit coded characterset for
	information interchange, International Reference Version} (IRV)
	information interchange, International Reference Version} (IRV)
	(\xref[Graphic characters]{usage:ASCII})\footnote{Available from
	(\xref[Graphic characters]{usage:ASCII})\footnote{%
	the American National Standards Institute, 11 West 42nd Street,
	\cbstart\sout{Available from the American National Standards Institute, 11 West 42nd Street,
	New York, NY 10036.};
	New York, NY 10036.}\cbend};


\item ANSI/IEEE 754-1985 \textit{Floating-point Standard},
\item ANSI/IEEE 754-1985 \emph{Floating-point Standard},
	(\xref[(12.2.1) Definition of terms]{float:terms}).
	(\xref[(12.2.1) Definition of terms]{float:terms}).
\end{itemize}
\end{itemize}