CVS difference for ai05s/ai05-0227-1.txt

--- ai05s/ai05-0227-1.txt	2011/04/12 00:07:24	1.6
+++ ai05s/ai05-0227-1.txt	2011/05/06 04:55:44	1.7
@@ -1,4 +1,7 @@
-!standard  1.1.4(14.2/2)                             11-03-11    AI05-0227-1/04
+!standard  1.1.4(14.2/2)                             11-05-05    AI05-0227-1/05
+!standard  2.3(5/2)
+!standard  2.3(5.3/2)
+!standard  3.5.1(5)
 !class binding interpretation 10-10-21
 !status Amendment 2012 11-03-11
 !status ARG Approved  6-0-2  11-02-20
@@ -84,22 +87,22 @@
 For instance, in most languages, the simple case folded equivalent of LATIN CAPITAL LETTER I (a
 upper case letter without a dot above) is LATIN SMALL LETTER I (an lower case letter with a dot
 above). In Turkish, though, LATIN CAPITAL LETTER I and LATIN CAPITAL LETTER WITH DOT ABOVE are two
-distinct letters, so the case folded equivalent of LATIN CAPTIAL LETTER I is LATIN SMALL LETTER DOTLESS I,
+distinct letters, so the case folded equivalent of LATIN CAPITAL LETTER I is LATIN SMALL LETTER DOTLESS I,
 and the case folded equivalent of LATIN CAPTIAL LETTER WITH DOT ABOVE I is LATIN SMALL LETTER I.
 Take for instance the following identifier (which is the name of a city on the Tigris river in
 Eastern Anatolia):
 
    D<I>YARBAKIR -- First I is dotted, second is not.
 
-A Turkish speaker would expect that the original identifier is equivalent to:
+A Turkish reader would expect that the original identifier is equivalent to:
 
    diyarbak<i>r
 
-However, case folding (and thus Ada) map this to:
+However, locale-independent simple case folding (and thus Ada) maps this to:
 
    d<I>yarbakir
 
-which is different from any of:
+which is different from any of the following identifiers:
 
    <the four values in 6.f>
 
@@ -254,6 +257,48 @@
 character names/classifications is not enough, as a future character set standard
 will surely change some of those. Thus we rejected this option.
 
+
+!corrigendum 1.1.4(14.2/2)
+
+@drepl
+When this International Standard mentions the conversion of some character or
+sequence of characters to upper case, it means the character or sequence of
+characters obtained by using locale-independent full case folding, as defined
+by documents referenced in the note in section 1 of ISO/IEC 10646:2003.
+@dby
+When this International Standard mentions the conversion of some character or sequence
+of characters to upper case, it means the character or sequence of characters obtained
+by using simple upper case mapping, as defined by documents referenced in the note
+in section 1 of ISO/IEC 10646:2003.
+
+!corrigendum 2.3(5/2)
+
+@drepl
+Two @fa<identifier>s are considered the same if they consist of the same
+sequence of characters after applying the following transformations (in
+this order):
+@dby
+Two @fa<identifier>s are considered the same if they consist of the same
+sequence of characters after applying locale-independent simple case folding,
+as defined by documents referenced in the note in section 1 of ISO/IEC 10646:2003.
+
+!corrigendum 2.3(5.3/2)
+
+@drepl
+After applying these transformations, an @fa<identifier> shall not be identical
+to a reserved word (in upper case).
+@dby
+After applying simple case folding, an @fa<identifier> shall not be identical
+to a reserved word.
+
+!corrigendum 3.5.1(5)
+
+@drepl
+The @fa<defining_identifier>s and @fa<defining_character_literal>s listed in an
+@fa<enumeration_type_definition> shall be distinct.
+@dby
+The @fa<defining_identifier>s in upper case and the @fa<defining_character_literal>s
+listed in an @fa<enumeration_type_definition> shall be distinct.
 
 !ACATS Test