CVS difference for ais/ai-00285.txt

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

--- ais/ai-00285.txt	2005/08/21 06:00:23	1.30
+++ ais/ai-00285.txt	2005/10/31 05:18:22	1.31
@@ -1,4 +1,4 @@
-!standard 2.1(1)                                      05-05-05  AI95-00285/16
+!standard 2.1(1)                                      05-09-20  AI95-00285/17
 !standard 2.1(2)
 !standard 2.1(3)
 !standard 2.1(4)
@@ -140,7 +140,7 @@
    - Letter, Other           -- e.g., HEBREW LETTER ALEF
    - Mark, Non-Spacing       -- e.g., COMBINING GRAVE ACCENT
    - Mark, Spacing Combining -- e.g., MUSICAL SYMBOL COMBINING AUGMENTATION DOT
-   - Number, Decimal Digit   -- e.g., DIGIT ZERO
+   - Number, Decimal         -- e.g., DIGIT ZERO
    - Number, Letter          -- e.g., ROMAN NUMERAL TWO
    - Other, Control          -- e.g., NULL
    - Other, Format           -- e.g., ACTIVATE ARABIC FORM SHAPING
@@ -181,7 +181,7 @@
                         number_letter
    identifier_extend ::= mark_non_spacing |
                          mark_spacing_combining |
-                         number_decimal_digit |
+                         number_decimal |
                          punctuation_connector |
                          other_format
 
@@ -200,7 +200,7 @@
    identifier_extend ::= identifier_start |
                          mark_non_spacing |
                          mark_spacing_combining |
-                         number_decimal_digit |
+                         number_decimal |
                          other_format
    identifier ::= identifier_start {[punctuation_connector] identifier_extend}
 
@@ -343,7 +343,7 @@
 Coded Character Set (UCS)
 
 ISO/IEC TR 19769:2004, Information technology - Programming languages,
-their environments and system software inferfaces - Extensions for the
+their environments and system software interfaces - Extensions for the
 programming language C to support new character data types
 
 
@@ -398,8 +398,8 @@
 mark_spacing_combining
 Any character whose General Category is defined to be "Mark, Spacing Combining".
 
-number_decimal_digit
-Any character whose General Category is defined to be "Number, Decimal Digit".
+number_decimal
+Any character whose General Category is defined to be "Number, Decimal".
 
 number_letter
 Any character whose General Category is defined to be "Number, Letter".
@@ -421,11 +421,9 @@
 
 format_effector
 The characters whose code position is 16#09# (CHARACTER TABULATION), 16#0A#
-(LINE FEED(LF)), 16#0B# (LINE TABULATION), 16#0C# (FORM FEED(FF)), 16#0D#
-(CARRIAGE RETURN(CR)), 16#85# (NEXT LINE(NEL)), and the characters in categories
-separator_line and 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.
+(LINE FEED), 16#0B# (LINE TABULATION), 16#0C# (FORM FEED), 16#0D#
+(CARRIAGE RETURN), 16#85# (NEXT LINE), and the characters in categories
+separator_line and separator_paragraph.
 
 other_control
 Any character whose General Category is defined to be "Other, Control", and
@@ -551,7 +549,7 @@
         identifier_start
       | mark_non_spacing
       | mark_spacing_combining
-      | number_decimal_digit
+      | number_decimal
       | other_format
    identifier ::= identifier_start {[punctuation_connector] identifier_extend}
 
@@ -577,7 +575,7 @@
 
 Add after 2.6(7):
 
-No transformation is performed on the sequence of characters in a string_literal.
+No transformation is performed on the sequence of characters of a string_literal.
 
 
 Replace 3.5(28-29) by:
@@ -1401,7 +1399,7 @@
 Coded Character Set (UCS)>.
 
 ISO/IEC TR 19769:2004, @i<Information technology @emdash Programming languages,
-their environments and system software inferfaces @emdash Extensions for the
+their environments and system software interfaces @emdash Extensions for the
 programming language C to support new character data types>.
 
 !corrigendum 2.1(1)
@@ -1516,8 +1514,8 @@
 @xhang<@xterm<@fa<digit>>
 One of the characters 0, 1, 2, 3, 4, 5, 6, 7, 8, or 9.>
 @dby
-@xhang<@xterm<@fa<number_decimal_digit>>
-Any character whose General Category is defined to be "Number, Decimal Digit".>
+@xhang<@xterm<@fa<number_decimal>>
+Any character whose General Category is defined to be "Number, Decimal".>
 
 @xhang<@xterm<@fa<number_letter>>
 Any character whose General Category is defined to be "Number, Letter".>
@@ -1560,11 +1558,9 @@
 @dby
 @xhang<@xterm<@fa<format_effector>>
 The characters whose code positions are 16#09# (CHARACTER TABULATION), 16#0A#
-(LINE FEED(LF)), 16#0B# (LINE TABULATION), 16#0C# (FORM FEED(FF)), 16#0D#
-(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.>
+(LINE FEED), 16#0B# (LINE TABULATION), 16#0C# (FORM FEED), 16#0D#
+(CARRIAGE RETURN), 16#85# (NEXT LINE), and the characters in
+categories @fa<separator_line> and @fa<separator_paragraph>.>
 
 @xhang<@xterm<@fa<other_control>>
 Any character whose General Category is defined to be "Other, Control", and
@@ -1690,7 +1686,7 @@
      identifier_start
    | mark_non_spacing
    | mark_spacing_combining
-   | number_decimal_digit
+   | number_decimal
    | other_format>>
 
 @xcode<@fa<identifier ::= identifier_start {[punctuation_connector] identifier_extend}>>
@@ -1742,7 +1738,7 @@
 6  An end of line cannot appear in a @fa<string_literal>.>>
 @dinst
 @xindent<@s9<7  No transformation is performed on the sequence of
-characters in a @fa<string_literal>.>>
+characters of a @fa<string_literal>.>>
 
 !corrigendum 3.5(27)
 
@@ -2741,6 +2737,7 @@
 @xcode<@b<with> Ada.Streams;
 @b<package> Ada.Wide_Wide_Text_IO.Text_Streams @b<is>
    @b<type> Stream_Access @b<is access all> Streams.Root_Stream_Type'Class;
+
    @b<function> Stream (File : @b<in> File_Type) @b<return> Stream_Access;
 @b<end> Ada.Wide_Wide_Text_IO.Text_Streams;>
 
@@ -2760,7 +2757,7 @@
 
    @b<type> char16_t @b<is> @ft<@i<<implementation-defined character type@>>>;
 
-   char16_nul : @b<constant> char16_t := @ft<@i<<implementation-defined>>;
+   char16_nul : @b<constant> char16_t := @ft<@i<implementation-defined>>;
 
    @b<function> To_C (Item : @b<in> Wide_Character) @b<return> char16_t;
    @b<function> To_Ada (Item : @b<in> char16_t) @b<return> Wide_Character;
@@ -2790,7 +2787,7 @@
 
    @b<type> char32_t @b<is> @ft<@i<<implementation-defined character type@>>>;
 
-   char32_nul : @b<constant> char32_t := @ft<@i<<implementation-defined>>;
+   char32_nul : @b<constant> char32_t := @ft<@i<implementation-defined>>;
 
    @b<function> To_C (Item : @b<in> Wide_Wide_Character) @b<return> char32_t;
    @b<function> To_Ada (Item : @b<in> char32_t) @b<return> Wide_Wide_Character;
@@ -3016,8 +3013,8 @@
 
 @xbullet<each occurrence of Character is replaced by Wide_Wide_Character,>
 @xbullet<each occurrence of Text_IO is replaced by Wide_Wide_Text_IO,>
-@xbullet<the subtype of Default_Currency is Wide_Wide_String rather than String, and
-each occurrence of String in the generic package Decimal_Output is replaced
+@xbullet<the subtype of Default_Currency is Wide_Wide_String rather than String, and>
+@xbullet<each occurrence of String in the generic package Decimal_Output is replaced
 by Wide_Wide_String.>
 
 @xindent<@s9<NOTES@hr

Questions? Ask the ACAA Technical Agent