CVS difference for ai05s/ai05-0137-2.txt

Differences between 1.5 and version 1.6
Log of other versions for file ai05s/ai05-0137-2.txt

--- ai05s/ai05-0137-2.txt	2010/10/19 03:51:17	1.5
+++ ai05s/ai05-0137-2.txt	2010/10/19 05:59:42	1.6
@@ -1,4 +1,4 @@
-!standard A.4.11                                       10-06-20  AI05-0137-2/02
+!standard A.4.11                                       10-10-19  AI05-0137-2/03
 !class Amendment 10-05-07
 !status Amendment 2012 10-05-07
 !status ARG Approved  6-0-3  10-06-20
@@ -202,7 +202,7 @@
 
 The exception Encoding_Error is also propagated in the following
 situations:
-    *  By a Decode function when an UTF encoded string contains an
+    *  By a Decode function when a UTF encoded string contains an
        invalid encoding sequence.
     *  By a Decode function when the expected encoding is UTF-16BE or
        UTF-16LE and the input string has an odd length.
@@ -219,16 +219,16 @@
        encodings, and the characters whose position is 16#FFFE# or
        16#FFFF# are also invalid because they conflict with BOM codes.
 
-Each of the Convert and Encode functions returns a String
-(respectively Wide_String) value whose characters have position values
+Each of the Convert and Encode functions returns a UTF_String (respectively
+UTF_8_String and UTF_16_String) value whose characters have position values
 that correspond to the encoding of the Item parameter according to the
 encoding scheme required by the function or specified by its
 Output_Scheme parameter. For UTF_8, no overlong encoding is
 returned. The lower bound of the returned string is 1.
 
-Each of the Decode functions takes a String (respectively Wide_String)
-Item parameter which is assumed to contain characters whose position
-values correspond to a valid encoding sequence according to the
+Each of the Decode functions takes a UTF_String (respectively UTF_8_String
+and UTF_16_String) Item parameter which is assumed to contain characters
+whose position values correspond to a valid encoding sequence according to the
 encoding scheme required by the function or specified by its
 Input_Scheme parameter, and returns the corresponding String,
 Wide_String or Wide_Wide_String value. The lower bound of the returned
@@ -456,8 +456,8 @@
 
 There are many other possible encoding schemes, including UTF-EBCDIC,
 Shift-JIS, SCSU, BOCU-1... It seemed sensible to provide only the most
-useful ones, while leaving the possibility (through an implementation
-advice) to provide others.
+useful ones, while leaving the possibility (through Implementation
+Advice) to provide others.
 
 When reading a file, a BOM can be expected as starting the first line
 of the file, but not subsequent lines. The proposed handling of BOM
@@ -473,7 +473,7 @@
    necessary to slice the first line specially.
 
 The Wide_Wide_String functions have been put in a separate package to
-avoid dragging the corresponding code when Wide_Wide_Strings are not
+avoid dragging in the corresponding code when Wide_Wide_Strings are not
 used in the application code.
 
 Alternative designs:
@@ -482,7 +482,7 @@
 (Wide_)String. That would enforce strong typing to differentiate
 between an Ada String and an encoded string. On the other hand, it is
 likely to be more of a burden than a help to most casual users. Moreover,
-it would not allow to keep ASIS program text to be kept as a Wide_String.
+it would not allow ASIS program text to be kept as a Wide_String.
 
 
 Existing similar packages:
@@ -668,7 +668,7 @@
 
 The exception Encoding_Error is also propagated in the following
 situations:
-  @xbullet<By a Decode function when an UTF encoded string contains an invalid
+  @xbullet<By a Decode function when a UTF encoded string contains an invalid
     encoding sequence.>
   @xbullet<By a Decode function when the expected encoding is UTF-16BE or
     UTF-16LE and the input string has an odd length.>
@@ -683,16 +683,16 @@
     encodings, and the characters whose position is 16#FFFE# or
     16#FFFF# are also invalid because they conflict with BOM codes.>
 
-Each of the Convert and Encode functions returns a String
-(respectively Wide_String) value whose characters have position values
+Each of the Convert and Encode functions returns a UTF_String (respectively
+UTF_8_String and UTF_16_String) value whose characters have position values
 that correspond to the encoding of the Item parameter according to the
 encoding scheme required by the function or specified by its
 Output_Scheme parameter. For UTF_8, no overlong encoding is
 returned. The lower bound of the returned string is 1.
 
-Each of the Decode functions takes a String (respectively Wide_String)
-Item parameter which is assumed to contain characters whose position
-values correspond to a valid encoding sequence according to the
+Each of the Decode functions takes a UTF_String (respectively UTF_8_String
+and UTF_16_String) Item parameter which is assumed to contain characters
+whose position values correspond to a valid encoding sequence according to the
 encoding scheme required by the function or specified by its
 Input_Scheme parameter, and returns the corresponding String, Wide_String,
 or Wide_Wide_String value. The lower bound of the returned string is 1.

Questions? Ask the ACAA Technical Agent