CVS difference for ais/ai-00285.txt

Differences between 1.28 and version 1.29
Log of other versions for file ais/ai-00285.txt

--- ais/ai-00285.txt	2005/05/15 23:42:09	1.28
+++ ais/ai-00285.txt	2005/06/16 23:47:22	1.29
@@ -342,7 +342,7 @@
 ISO/IEC 10646:2003, Information technology - Universal Multiple-Octet
 Coded Character Set (UCS)
 
-ISO/IEC TR 19769:2004, Information technology - Programming Languages,
+ISO/IEC TR 19769:2004, Information technology - Programming languages,
 their environments and system software inferfaces - Extensions for the
 programming language C to support new character data types
 
@@ -524,8 +524,8 @@
 is 16#09# (CHARACTER TABULATION) signifies at least one end of line.
 
 In some cases an explicit _separator_ is required to separate adjacent lexical
-elements. A separator is any of a separator_space, a format_effector or the end
-of a line, as follows:
+elements. A separator is any of a separator_space, a format_effector, or the
+end of a line, as follows:
 
 o   A separator_space is a separator except within a comment, a string_literal,
     or a character_literal.
@@ -605,18 +605,18 @@
 Replace 3.5(37) by:
 
 The function returns an image of the value of Arg as a String. The lower bound
-of the result is one. The image has the same sequence of character as defined
-for S'Wide_Wide_Image if all the graphic characters are defined in Character;
-otherwise the sequence of characters is implementation defined (but no shorter
-than that of S'Wide_Wide_Image for the same value of Arg).
+of the result is one. The image has the same sequence of graphic characters
+as defined for S'Wide_Wide_Image if all the graphic characters are defined in
+Character; otherwise the sequence of characters is implementation defined (but
+no shorter than that of S'Wide_Wide_Image for the same value of Arg).
 
 
 Add after 3.5(37):
 
 S'Wide_Wide_Width
 S'Wide_Wide_Width denotes the maximum length of a Wide_Wide_String returned by
-S'Wide_Wide_Image over all the values of S. It denotes zero for a subtype that
-has a null range. Its type is universal_integer.
+S'Wide_Wide_Image over all values of the subtype S. It denotes zero for a
+subtype that has a null range. Its type is universal_integer.
 
 
 Replace 3.5(40-45) by:
@@ -727,15 +727,15 @@
 Replace 3.6.3(2) by:
 
 There are three predefined string types, String, Wide_String, and
-Wide_Wide_String, each indexed by the value of the predefined subtype Positive;
+Wide_Wide_String, each indexed by values of the predefined subtype Positive;
 these are declared in the visible part of package Standard:
 
 
 Replace 3.6.3(4) by:
 
-    type String is array (Positive range <>) of Character;
-    type Wide_String is array (Positive range <>) of Wide_Character;
-    type Wide_Wide_String is array (Positive range <>) of Wide_Wide_Character;
+    type String is array(Positive range <>) of Character;
+    type Wide_String is array(Positive range <>) of Wide_Character;
+    type Wide_Wide_String is array(Positive range <>) of Wide_Wide_Character;
 
 
 Fix the list in A(2/1).
@@ -1393,15 +1393,15 @@
 !corrigendum 1.2(8/1)
 
 @drepl
-ISO/IEC 10646-1:1993, @i<Information technology - Universal Multiple-Octet Coded
+ISO/IEC 10646-1:1993, @i<Information technology @emdash Universal Multiple-Octet Coded
 Character Set (UCS) - Part 1: Architecture and Basic Multilingual Plane>,
 supplemented by Technical Corrigendum 1:1996.
 @dby
-ISO/IEC 10646:2003, @i<Information technology - Universal Multiple-Octet
+ISO/IEC 10646:2003, @i<Information technology @emdash Universal Multiple-Octet
 Coded Character Set (UCS)>.
 
-ISO/IEC TR 19769:2004, @i<Information technology - Programming Languages,
-their environments and system software inferfaces - Extensions for the
+ISO/IEC TR 19769:2004, @i<Information technology @emdash Programming languages,
+their environments and system software inferfaces @emdash Extensions for the
 programming language C to support new character data types>.
 
 !corrigendum 2.1(1)
@@ -1556,7 +1556,7 @@
 @drepl
 @xhang<@xterm<@fa<format_effector>>
 The control functions of ISO 6429 called character tabulation (HT), line
-tabulation (VT), carriage return (CR), line feed (LF), and form feed (FF).
+tabulation (VT), carriage return (CR), line feed (LF), and form feed (FF).>
 @dby
 @xhang<@xterm<@fa<format_effector>>
 The characters whose code positions are 16#09# (CHARACTER TABULATION), 16#0A#
@@ -1564,7 +1564,7 @@
 (CARRIAGE RETURN(CR)), 16#85# (NEXT LINE(NEL)), and the characters in
 categories @fa<separator_line> and @fa<separator_paragraph>.  The names
 mentioned in parentheses in this list are not defined by ISO/IEC 10646:2003;
-they are only used for convenience in this International Standard.
+they are only used for convenience in this International Standard.>
 
 @xhang<@xterm<@fa<other_control>>
 Any character whose General Category is defined to be "Other, Control", and
@@ -1646,7 +1646,7 @@
 @dby
 In some cases an explicit @i<separator> is required to separate adjacent
 lexical elements. A separator is any of a @fa<separator_space>, a
-@fa<format_effector> or the end of a line, as follows:
+@fa<format_effector>, or the end of a line, as follows:
 
 !corrigendum 2.2(4)
 
@@ -1668,9 +1668,9 @@
 !corrigendum 2.2(8)
 
 @drepl
-A delimiter is either one of the following special characters:
+A @i<delimiter> is either one of the following special characters
 @dby
-A delimiter is either one of the following characters:
+A @i<delimiter> is either one of the following characters:
 
 !corrigendum 2.3(02)
 
@@ -1776,14 +1776,14 @@
 @i<nongraphic character> (a value of a character type that has no enumeration
 literal associated with it), the result is a corresponding language-defined
 name in upper case (for example, the image of the nongraphic character
-identified as @i<nul> is "NUL" -- the quotes are not part of the image).>
+identified as @i<nul> is "NUL" @emdash the quotes are not part of the image).>
 
 @xindent<The image of a floating point value is a decimal real literal best
 approximating the value (rounded away from zero if halfway between) with a
 single leading character that is either a minus sign or a space, a single digit
-(that is nonzero unless the value is zero), a decimal point, S'Digits-1 (see
+(that is nonzero unless the value is zero), a decimal point, S'Digits@endash1 (see
 3.5.8) digits after the decimal point (but one if S'Digits is one), an upper
-case E, the sign of the exponent (either + or -), and two or more digits (with
+case E, the sign of the exponent (either + or @endash), and two or more digits (with
 leading zeros if necessary) representing the exponent. If S'Signed_Zeros is
 True, then the leading character is a minus sign for a negatively signed zero.>
 
@@ -1800,12 +1800,12 @@
 sequence of characters representing the value in display form. The lower bound
 of the result is one.>
 @dby
-@xindent<The function returns an image of the value of @i<Arg> as a Wide_String,
-that is, a sequence of characters representing the value in display form. The
-lower bound of the result is one. The image has the same sequence of character
-as defined for S'Wide_Wide_Image if all the graphic characters are defined in
-Wide_Character; otherwise the sequence of characters is implementation defined
-(but no shorter than that of S'Wide_Wide_Image for the same value of Arg).>
+@xindent<The function returns an image of the value of @i<Arg> as a Wide_String.
+The lower bound of the result is one. The image has the same sequence of
+character as defined for S'Wide_Wide_Image if all the graphic characters are
+defined in Wide_Character; otherwise the sequence of characters is
+implementation defined (but no shorter than that of S'Wide_Wide_Image for the
+same value of Arg).>
 
 !corrigendum 3.5(31)
 
@@ -1823,7 +1823,7 @@
 @i<nongraphic character> (a value of a character type that has no enumeration
 literal associated with it), the result is a corresponding language-defined or
 implementation-defined name in upper case (for example, the image of the
-nongraphic character identified as @i<nul> is "NUL" -- the quotes are not part
+nongraphic character identified as @i<nul> is "NUL" @emdash the quotes are not part
 of the image).>
 
 !corrigendum 3.5(33)
@@ -1834,9 +1834,10 @@
 single leading character that is either a minus sign or a space, a single digit
 (that is nonzero unless the value is zero), a decimal point, S'Digits-1 (see
 3.5.8) digits after the decimal point (but one if S'Digits is one), an upper
-case E, the sign of the exponent (either + or -), and two or more digits (with
-leading zeros if necessary) representing the exponent. If S'Signed_Zeros is
-True, then the leading character is a minus sign for a negatively signed zero.>
+case E, the sign of the exponent (either + or @endash), and two or more digits
+(with leading zeros if necessary) representing the exponent. If S'Signed_Zeros
+is True, then the leading character is a minus sign for a negatively signed
+zero.>
 
 !corrigendum 3.5(34)
 
@@ -1857,15 +1858,16 @@
 defined (but no shorter than that of S'Wide_Image for the same value of @i<Arg>).>
 @dby
 @xindent<The function returns an image of the value of @i<Arg> as a String. The
-lower bound of the result is one. The image has the same sequence of character
-as defined for S'Wide_Wide_Image if all the graphic characters are defined in
-Character; otherwise the sequence of characters is implementation defined (but
-no shorter than that of S'Wide_Wide_Image for the same value of @i<Arg>).>
+lower bound of the result is one. The image has the same sequence of graphic
+characters as that defined for S'Wide_Wide_Image if all the graphic characters
+are defined in Character; otherwise the sequence of characters is
+implementation defined (but no shorter than that of S'Wide_Wide_Image for the
+same value of @i<Arg>).>
 
 @xhang<@xterm<S'Wide_Wide_Width>
 S'Wide_Wide_Width denotes the maximum length of a Wide_Wide_String returned by
-S'Wide_Wide_Image over all the values of S. It denotes zero for a subtype that
-has a null range. Its type is @i<universal_integer>.>
+S'Wide_Wide_Image over all values of the subtype S. It denotes zero for a
+subtype that has a null range. Its type is @i<universal_integer>.>
 
 !corrigendum 3.5(39)
 
@@ -1928,7 +1930,7 @@
 if the sequence of characters of the parameter (ignoring leading and trailing
 spaces) has the syntax of an enumeration literal and if it corresponds to a
 literal of the type of S (or corresponds to the result of S'Wide_Image
-for a nongraphic character of the type), the result is the corresponding
+for a value of the type), the result is the corresponding
 enumeration value; otherwise Constraint_Error is raised. For a numeric subtype
 S, the evaluation of a call on S'Wide_Value with @i<Arg> of type Wide_String is
 equivalent to a call on S'Wide_Wide_Value for a corresponding @i<Arg> of type
@@ -2043,7 +2045,7 @@
 language-defined name, which is not usable as an enumeration literal, but which
 is usable with the attributes (Wide_)Image and (Wide_)Value; these names are
 given in the definition of type Character in A.1, ``The Package Standard'', but
-are set in @fa<italics>.
+are set in @i<italics>.
 @dby
 The predefined type Character is a character type whose values correspond to
 the 256 code positions of Row 00 (also known as Latin-1) of the ISO/IEC 10646:2003 Basic
@@ -2054,7 +2056,7 @@
 is usable with the attributes Image, Wide_Image,
 Wide_Wide_Image, Value, Wide_Value, and Wide_Wide_Value; these names are
 given in the definition of type Character in A.1, ``The Package Standard'', but
-are set in @fa<italics>.
+are set in @i<italics>.
 
 !corrigendum 3.5.2(3)
 
@@ -2121,43 +2123,43 @@
 part of package Standard:
 @dby
 There are three predefined string types, String, Wide_String, and
-Wide_Wide_String, each indexed by the value of the predefined subtype Positive;
+Wide_Wide_String, each indexed by values of the predefined subtype Positive;
 these are declared in the visible part of package Standard:
 
 !corrigendum 3.6.3(4)
 
 @drepl
-@xcode<@b<type> String @b<is array> (Positive @b<range> <@>) @b<of> Character;
-@b<type> Wide_String @b<is array> (Positive @b<range> <@>) @b<of> Wide_Character;>
+@xcode<@b<type> String @b<is array>(Positive @b<range> <@>) @b<of> Character;
+@b<type> Wide_String @b<is array>(Positive @b<range> <@>) @b<of> Wide_Character;>
 @dby
-@xcode<@b<type> String @b<is array> (Positive @b<range> <@>) @b<of> Character;
-@b<type> Wide_String @b<is array> (Positive @b<range> <@>) @b<of> Wide_Character;
-@b<type> Wide_Wide_String @b<is array> (Positive @b<range> <@>) @b<of> Wide_Wide_Character;>
+@xcode<@b<type> String @b<is array>(Positive @b<range> <@>) @b<of> Character;
+@b<type> Wide_String @b<is array>(Positive @b<range> <@>) @b<of> Wide_Character;
+@b<type> Wide_Wide_String @b<is array>(Positive @b<range> <@>) @b<of> Wide_Wide_Character;>
 
 !corrigendum A.1(36)
 
 @drepl
-@xcode<   -- @ft<@i<The predefined operators for the type Character are the same as for>>
-   -- @ft<@i<any enumeration type.>>
+@xcode<   --@ft<@i< The predefined operators for the type Character are the same as for>>
+   --@ft<@i< any enumeration type.>>
 
-   -- @ft<@i<The declaration of type Wide_Character is based on the standard ISO 10646 BMP character set.>>
-   -- @ft<@i<The first 256 positions have the same contents as type Character. See 3.5.2.>>
+   --@ft<@i< The declaration of type Wide_Character is based on the standard ISO 10646 BMP character set.>>
+   --@ft<@i< The first 256 positions have the same contents as type Character. See 3.5.2.>>
 
    @b<type> Wide_Character @b<is> (@i<nul>, @i<soh> ... @i<FFFE>, @i<FFFF>);
 
    @b<package> ASCII @b<is> ... @b<end> ASCII;  --@ft<@i<Obsolescent; see J.5>>>
 @dby
-@xcode<   -- @ft<@i<The predefined operators for the type Character are the same as for>>
-   -- @ft<@i<any enumeration type.>>
+@xcode<   --@ft<@i< The predefined operators for the type Character are the same as for>>
+   --@ft<@i< any enumeration type.>>
 
-   -- @ft<@i<The declaration of type Wide_Character is based on the standard ISO/IEC 10646:2003 BMP character set.>>
-   -- @ft<@i<The first 256 positions have the same contents as type Character. See 3.5.2.>>
+   --@ft<@i< The declaration of type Wide_Character is based on the standard ISO/IEC 10646:2003 BMP character>>
+   --@ft<@i< set. The first 256 positions have the same contents as type Character. See 3.5.2.>>
 
    @b<type> Wide_Character @b<is> (@i<nul>, @i<soh> ... @i<FFFE>, @i<FFFF>);
 
-   -- @ft<@i<The declaration of type Wide_Wide_Character is based on the full>>
-   -- @ft<@i<ISO/IEC 10646:2003 character set. The first 65536 positions have the>>
-   -- @ft<@i<same contents as type Wide_Character. See 3.5.2.>>
+   --@ft<@i< The declaration of type Wide_Wide_Character is based on the full>>
+   --@ft<@i< ISO/IEC 10646:2003 character set. The first 65536 positions have the>>
+   --@ft<@i< same contents as type Wide_Character. See 3.5.2.>>
 
    @b<type> Wide_Wide_Character @b<is> (@i<nul>, @i<soh> ... @i<FFFE>, @i<FFFF>, ...);
 
@@ -2167,15 +2169,15 @@
 !corrigendum A.1(42)
 
 @drepl
-@xcode<   -- @ft<@i<The predefined operators for this type correspond to those for String>>>
+@xcode<   --@ft<@i< The predefined operators for this type correspond to those for String>>>
 @dby
-@xcode<   -- @ft<@i<The predefined operators for this type correspond to those for String.>>
+@xcode<   --@ft<@i< The predefined operators for this type correspond to those for String.>>
 
     @b<type> Wide_Wide_String @b<is array> (Positive @b<range> <@>)
        @b<of> Wide_Wide_Character;
     @b<pragma> Pack (Wide_Wide_String);
 
-    -- @ft<@i<The predefined operators for this type correspond to those for String.>>>
+    --@ft<@i< The predefined operators for this type correspond to those for String.>>>
 
 !corrigendum A.1(49)
 
@@ -2186,7 +2188,7 @@
 occurrence of the character literal ' ' in this International Standard refers
 to the space character. Similarly, the character literals for hyphen (position
 45) and soft hyphen (position 173) correspond to different values. Unless
-indicated otherwise, each occurrence of the character literal '-' in this
+indicated otherwise, each occurrence of the character literal '@endash' in this
 International Standard refers to the hyphen character.
 @dby
 In each of the types Character, Wide_Character, and Wide_Wide_Character, the
@@ -2196,7 +2198,7 @@
 Standard refers to the space character. Similarly, the character literals for
 hyphen (position 45) and soft hyphen (position 173) correspond to different
 values. Unless indicated otherwise, each occurrence of the character literal
-'-' in this International Standard refers to the hyphen character.
+'@endash' in this International Standard refers to the hyphen character.
 
 !corrigendum A.3(1)
 
@@ -2429,11 +2431,11 @@
 
 @drepl
 @xcode<   Character_Set : @b<constant> Wide_Maps.Wide_Character_Set;
-   -- @ft<@i<Contains each Wide_Character value WC such that Characters.Is_Character(WC) is True>>>
+   --@ft<@i< Contains each Wide_Character value WC such that Characters.Is_Character(WC) is True>>>
 @dby
 @xcode<   Character_Set : @b<constant> Wide_Maps.Wide_Character_Set;
-   -- @ft<@i<Contains each Wide_Character value WC such that>>
-   -- @ft<@i<Characters.Handling.Is_Character(WC) is True>>>
+   --@ft<@i< Contains each Wide_Character value WC such that>>
+   --@ft<@i< Characters.Handling.Is_Character(WC) is True>>>
 
 !comment Updated for AI-161 change.
 !comment Updated for AI-301 changes.
@@ -2454,7 +2456,7 @@
 @xcode<@b<package> Ada.Strings.Wide_Wide_Maps @b<is>
    @b<pragma> Preelaborate(Wide_Wide_Maps);
 
-   -- @ft<@i<Representation for a set of Wide_Wide_Character values:>>
+   --@ft<@i< Representation for a set of Wide_Wide_Character values:>>
    @b<type> Wide_Wide_Character_Set @b<is private>;
    @b<pragma> Preelaborable_Initialization(Wide_Wide_Character_Set);
 
@@ -2465,7 +2467,7 @@
          Low : Wide_Wide_Character;
          High : Wide_Wide_Character;
       @b<end record>;
-   -- @ft<@i<Represents Wide_Wide_Character range Low..High>>
+   --@ft<@i< Represents Wide_Wide_Character range Low..High>>
 
    @b<type> Wide_Wide_Character_Ranges @b<is array> (Positive @b<range> <@>)
          @b<of> Wide_Wide_Character_Range;
@@ -2504,7 +2506,7 @@
                   Right : @b<in> Wide_Wide_Character_Set)
          @b<return> Boolean @b<renames> Is_Subset;
 
-   -- @ft<@i<Alternative representation for a set of Wide_Wide_Character values:>>
+   --@ft<@i< Alternative representation for a set of Wide_Wide_Character values:>>
    sub@b<type> Wide_Wide_Character_Sequence @b<is> Wide_Wide_String;
 
    @b<function> To_Set (Sequence : @b<in> Wide_Wide_Character_Sequence)
@@ -2516,8 +2518,8 @@
    @b<function> To_Sequence (Set : @b<in> Wide_Wide_Character_Set)
          @b<return> Wide_Wide_Character_Sequence;
 
-   -- @ft<@i<Representation for a Wide_Wide_Character to Wide_Wide_Character>>
-   -- @ft<@i<mapping:>>
+   --@ft<@i< Representation for a Wide_Wide_Character to Wide_Wide_Character>>
+   --@ft<@i< mapping:>>
    @b<type> Wide_Wide_Character_Mapping @b<is private>;
    @b<pragma> Preelaborable_Initialization(Wide_Wide_Character_Mapping);
 
@@ -2541,7 +2543,7 @@
          @b<return> Wide_Wide_Character;
 
 @b<private>
-   ... -- @ft<@i<not specified by the language>>
+   ... --@ft<@i< not specified by the language>>
 @b<end> Ada.Strings.Wide_Wide_Maps;>
 
 The context clause for each of the packages Strings.Wide_Wide_Fixed,
@@ -2574,10 +2576,10 @@
 Strings.Wide_Wide_Maps.Wide_Wide_Constants:
 
 @xcode<   Character_Set : @b<constant> Wide_Wide_Maps.Wide_Wide_Character_Set;
-   -- @ft<@i<Contains each Wide_Wide_Character value WWC such that>>
-   -- @ft<@i<Characters.Handling.Is_Character(WWC) is True>>
+   --@ft<@i< Contains each Wide_Wide_Character value WWC such that>>
+   --@ft<@i< Characters.Handling.Is_Character(WWC) is True>>
    Wide_Character_Set : @b<constant> Wide_Wide_Maps.Wide_Wide_Character_Set;
-   -- @ft<@i<Contains each Wide_Wide_Character value WWC such that>>
+   --@ft<@i< Contains each Wide_Wide_Character value WWC such that>>
    --@ft<@i< Characters.Handling.Is_Wide_Character(WWC) is True>>>
 
 @xindent<@s9<NOTES@hr
@@ -2654,7 +2656,7 @@
 Direct_IO declares a different type File_Type. In the case of Text_IO,
 Wide_Text_IO, and Streams.Stream_IO, the corresponding type File_Type is
 unique.>>
-@drepl
+@dby
 @xindent<@s9<18  Each instantiation of the generic packages Sequential_IO and
 Direct_IO declares a different type File_Type. In the case of Text_IO,
 Wide_Text_IO, Wide_Wide_Text_IO, and Streams.Stream_IO, the corresponding type
@@ -2754,7 +2756,7 @@
                      Count    : @b<out> Natural;
                      Trim_Nul : @b<in> Boolean := True);>
 @dinss
-@xcode<   -- @ft<@i<ISO/IEC 10646:2003 compatible types defined by ISO/IEC TR 19769:2004.>>
+@xcode<   --@ft<@i< ISO/IEC 10646:2003 compatible types defined by ISO/IEC TR 19769:2004.>>
 
    @b<type> char16_t @b<is> @ft<@i<<implementation-defined character type@>>>;
 

Questions? Ask the ACAA Technical Agent