Merge branch 'hb/unicode/OTP-10302'

OTP-10742
OTP-10745
OTP-10749

* hb/unicode/OTP-10302:
  [stdlib] Remove documentation of ~tp
  Remove one use of iolist_size/1 in io_lib_pretty.erl
  Add a new function proc_lib:format/2 which takes encoding
  Export the type erl_scan:token()
  Make adjustments for Unicode
  [stdlib] Change default of erl_scan's unicode option
  Update preloaded
  Correct recently introduced Unicode related type errors
  [stdlib] Introduce new functions epp:read_encoding_from_binary/1,2
  Extend char() to Unicode characters
  [kernel] Correct bugs in the old shell (user.erl)
  [parsetools] Change the encoding of test suites to UTF-8
  [stdlib] Fix a contract bug
  [stdlib] Update the Unicode examples in STDLIB User's Guide
  [stdlib] Remove documentation of Unicode functions in io_lib

1 files changed, 34 insertions, 37 deletions

diff --git a/lib/stdlib/doc/src/io_lib.xml b/lib/stdlib/doc/src/io_lib.xml
index 617a6b74fc..001d34a7c2 100644
--- a/lib/stdlib/doc/src/io_lib.xml
+++ b/lib/stdlib/doc/src/io_lib.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2012</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -43,12 +43,6 @@
       <name name="chars"/>
     </datatype>
     <datatype>
-      <name name="unicode_chars"/>
-    </datatype>
-    <datatype>
-      <name name="unicode_string"/>
-    </datatype>
-    <datatype>
       <name name="continuation"/>
       <desc><p>A continuation as returned by <seealso marker="#fread/3"><c>fread/3</c></seealso>.</p>
       </desc>
@@ -59,6 +53,9 @@
     <datatype>
       <name name="fread_error"/>
     </datatype>
+    <datatype>
+      <name name="latin1_string"/>
+    </datatype>
   </datatypes>
   <funcs>
     <func>
@@ -213,25 +210,25 @@
       <name name="write_string" arity="1"/>
       <fsummary>Write a string</fsummary>
       <desc>
-        <p>Returns the list of characters needed to print <c><anno>String</anno></c>
-          as a string.</p>
+        <p>Returns the list of characters needed to print
+          <c><anno>String</anno></c> as a string.</p>
       </desc>
     </func>
     <func>
-      <name name="write_unicode_string" arity="1"/>
-      <fsummary>Write a Unicode string</fsummary>
+      <name name="write_string_as_latin1" arity="1"/>
+      <fsummary>Write a string</fsummary>
       <desc>
         <p>Returns the list of characters needed to print
-          <c><anno>UnicodeString</anno></c> as a string.</p>
+          <c><anno>String</anno></c> as a string. Non-Latin-1
+          characters are escaped.</p>
       </desc>
     </func>
     <func>
-      <name name="write_unicode_string_as_latin1" arity="1"/>
-      <fsummary>Write a Unicode string</fsummary>
+      <name name="write_latin1_string" arity="1"/>
+      <fsummary>Write an ISO-latin-1 string</fsummary>
       <desc>
         <p>Returns the list of characters needed to print
-          <c><anno>UnicodeString</anno></c> as a string. Non-Latin-1
-          characters are escaped.</p>
+          <c><anno>Latin1String</anno></c> as a string.</p>
       </desc>
     </func>
     <func>
@@ -239,24 +236,24 @@
       <fsummary>Write a character</fsummary>
       <desc>
         <p>Returns the list of characters needed to print a character
-          constant in the ISO-latin-1 character set.</p>
+          constant in the Unicode character set.</p>
       </desc>
     </func>
     <func>
-      <name name="write_unicode_char" arity="1"/>
-      <fsummary>Write a Unicode character</fsummary>
+      <name name="write_char_as_latin1" arity="1"/>
+      <fsummary>Write a character</fsummary>
       <desc>
         <p>Returns the list of characters needed to print a character
-          constant in the Unicode character set.</p>
+          constant in the Unicode character set. Non-Latin-1 characters
+          are escaped.</p>
       </desc>
     </func>
     <func>
-      <name name="write_unicode_char_as_latin1" arity="1"/>
-      <fsummary>Write a Unicode character</fsummary>
+      <name name="write_latin1_char" arity="1"/>
+      <fsummary>Write an ISO-latin-1 character</fsummary>
       <desc>
         <p>Returns the list of characters needed to print a character
-          constant in the Unicode character set. Non-Latin-1 characters
-          are escaped.</p>
+          constant in the ISO-latin-1 character set.</p>
       </desc>
     </func>
     <func>
@@ -272,15 +269,15 @@
       <fsummary>Test for a list of characters</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a flat list of
-          characters in the ISO-latin-1 range, otherwise it returns <c>false</c>.</p>
+          characters in the Unicode range, otherwise it returns <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name name="unicode_char_list" arity="1"/>
-      <fsummary>Test for a list of Unicode characters</fsummary>
+      <name name="latin1_char_list" arity="1"/>
+      <fsummary>Test for a list of ISO-latin-1 characters</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a flat list of
-          characters in the Unicode range, otherwise it returns <c>false</c>.</p>
+          characters in the ISO-latin-1 range, otherwise it returns <c>false</c>.</p>
       </desc>
     </func>
     <func>
@@ -288,31 +285,31 @@
       <fsummary>Test for a deep list of characters</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a, possibly deep, list
-          of characters in the ISO-latin-1 range, otherwise it returns <c>false</c>.</p>
+          of characters in the Unicode range, otherwise it returns <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name name="deep_unicode_char_list" arity="1"/>
-      <fsummary>Test for a deep list of Unicode characters</fsummary>
+      <name name="deep_latin1_char_list" arity="1"/>
+      <fsummary>Test for a deep list of characters</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a, possibly deep, list
-          of characters in the Unicode range, otherwise it returns <c>false</c>.</p>
+          of characters in the ISO-latin-1 range, otherwise it returns <c>false</c>.</p>
       </desc>
     </func>
     <func>
       <name name="printable_list" arity="1"/>
-      <fsummary>Test for a list of printable ISO-latin-1 characters</fsummary>
+      <fsummary>Test for a list of printable characters</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a flat list of
-          printable ISO-latin-1 characters, otherwise it returns <c>false</c>.</p>
+          printable Unicode characters, otherwise it returns <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name name="printable_unicode_list" arity="1"/>
-      <fsummary>Test for a list of printable Unicode characters</fsummary>
+      <name name="printable_latin1_list" arity="1"/>
+      <fsummary>Test for a list of printable ISO-latin-1 characters</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a flat list of
-          printable Unicode characters, otherwise it returns <c>false</c>.</p>
+          printable ISO-latin-1 characters, otherwise it returns <c>false</c>.</p>
       </desc>
     </func>
   </funcs>