phonelib 0.0.2 → 0.1.0

data/README.rdoc

@@ -2,10 +2,11 @@
 
 {<img src="https://travis-ci.org/daddyz/phonelib.png?branch=master" alt="Build Status" />}[http://travis-ci.org/daddyz/phonelib]
 {<img src="https://badge.fury.io/rb/phonelib.png" alt="Gem Version" />}[http://badge.fury.io/rb/phonelib]
-{<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/daddyz/phonelib]
+{<img src="https://codeclimate.com/github/daddyz/phonelib.png" />}[https://codeclimate.com/github/daddyz/phonelib]
 
 Phonelib is a gem allowing you to validate phone number. All validations are based on {Google libphonenumber}[http://code.google.com/p/libphonenumber/].
-Currently it can make only basic validation and still not include all Google's library functions.
+Currently it can make basic validations and formatting to e164 international number format and national number format with prefix.
+But it still doesn't include all Google's library functionality.
 
 == Information
 
@@ -21,7 +22,7 @@ https://github.com/daddyz/phonelib/issues
 
 === Example application
 
-You can see an example of phonelib model validation working in test/dummy application of this gem
+You can see an example of ActiveRecord validation by phonelib working in test/dummy application of this gem
 
 == Getting started
 
@@ -108,11 +109,15 @@ Also you can fetch all matched countries
   phone.countries # returns array of all matched countries
   phone.country   # returns first element from array of all matched countries
 
+Also it is possible to get formatted phone number
+
+  phone.international # returns formatted e164 international phone number
+  phone.national      # returns formatted national number with country prefix
+
 Phone class has following attributes
 
   phone.original        # string that was passed as phone number
   phone.sanitized       # sanitized phone number (only digits left)
-  phone.national_number # phone number without country code
 
 === How it works
 

data/data/PhoneNumberMetaData.xml

@@ -631,9 +631,7 @@
         <exampleNumber>10123456</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Adding 55 from online numbers found and SMSs received from numbers with this prefix. It
-             seems to be used by Orange Armenia. Part of the range 97 is used by Nagorno-Karabakh
-             Republic. -->
+        <!-- Part of the range 97 is used by Nagorno-Karabakh Republic. -->
         <nationalNumberPattern>
           (?:
             55|
@@ -2049,22 +2047,53 @@
       <availableFormats>
         <numberFormat pattern="(2)(\d{7})">
           <leadingDigits>2</leadingDigits>
-          <format>$1 $2</format>
+          <format>$1-$2</format>
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{4,6})">
           <leadingDigits>[3-79]1</leadingDigits>
-          <format>$1 $2</format>
+          <format>$1-$2</format>
+        </numberFormat>
+        <!-- Mobile numbers, VOIP, and four-digit fixed-line area codes. -->
+        <numberFormat pattern="(\d{4})(\d{3,6})">
+          <leadingDigits>
+            1|
+            3(?:
+              0|
+              [2-58]2
+            )|
+            4(?:
+              0|
+              [25]2|
+              3[23]|
+              [4689][25]
+            )|
+            5(?:
+              [02-578]2|
+              6[25]
+            )|
+            6(?:
+              [0347-9]2|
+              [26][25]
+            )|
+            7[02-9]2|
+            8(?:
+              [023][23]|
+              [4-7]2
+            )|
+            9(?:
+              [02][23]|
+              [458]2|
+              6[016]
+            )
+          </leadingDigits>
+          <format>$1-$2</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{3,7})">
           <leadingDigits>
             [3-79][2-9]|
             8
           </leadingDigits>
-          <format>$1 $2</format>
-        </numberFormat>
-        <numberFormat pattern="(\d{4})(\d{6})">
-          <leadingDigits>1</leadingDigits>
-          <format>$1 $2</format>
+          <format>$1-$2</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
@@ -2083,7 +2112,10 @@
              first by leading digit, then within by number of digits. Several Dhaka prefixes (02 731
              etc) are included despite not being mentioned on the wikipedia page or ITU doc due to
              online evidence. Another oddity is Chittagong - some numbers have a leading 2, others
-             do not - both are allowed for now. -->
+             do not - both are allowed for now. For some area codes, the subscriber number length
+             described in our source documentation doesn't match numbers online (e.g. 05222) so we
+             allow both for now. (This applies to 0431, 04329, 04623, 05327 as well). We have
+             also added 04452 and 04923 from numbers found online. -->
         <nationalNumberPattern>
           2(?:
             7(?:
@@ -2115,74 +2147,223 @@
             )
           )\d{4}|
           3(?:
-            [6-8]1|
-            (?:
-              0[23]|
-              [25][12]|
-              82|
-              416
-            )\d|
-            (?:
-              31|
-              12?[5-7]
-            )\d{2}
+            12?[5-7]\d{2}|
+            0(?:
+              2(?:
+                [025-79]\d|
+                [348]\d{1,2}
+              )|
+              3(?:
+                [2-4]\d|
+                [56]\d?
+              )
+            )|
+            2(?:
+              1\d{2}|
+              2(?:
+                [12]\d|
+                [35]\d{1,2}|
+                4\d?
+              )
+            )|
+            3(?:
+              1\d{2}|
+              2(?:
+                [2356]\d|
+                4\d{1,2}
+              )
+            )|
+            4(?:
+              1\d{2}|
+              2(?:
+                2\d{1,2}|
+                [47]|
+                5\d{2}
+              )
+            )|
+            5(?:
+              1\d{2}|
+              29
+            )|
+            [67]1\d{2}|
+            8(?:
+              1\d{2}|
+              2(?:
+                2\d{2}|
+                3|
+                4\d
+              )
+            )|
           )\d{3}|
           4(?:
-            (?:
-              02|
-              [49]6|
-              [68]1
+            0(?:
+              2(?:
+                [09]\d|
+                7
+              )|
+              33\d{2}
             )|
-            (?:
-              0[13]|
-              21\d? |
-              [23]2|
-              [457][12]|
-              6[28]
-            )\d|
-            (?:
-              23|
-              [39]1
-            )\d{2}|
-            1\d{3}
+            1\d{3}|
+            2(?:
+              1\d{2}|
+              2(?:
+                [25]\d?|
+                [348]\d|
+                [67]\d{1,2}
+              )
+            )|
+            3(?:
+              1\d{2}(?:\d{2})?|
+              2(?:
+                [045]\d|
+                [236-9]\d{1,2}
+              )|
+              32\d{2}
+            )|
+            4(?:
+              [18]\d{2}|
+              2(?:
+                [2-46]\d{2}|
+                3
+              )|
+              5[25]\d{2}
+            )|
+            5(?:
+              1\d{2}|
+              2(?:
+                3\d|
+                5
+              )
+            )|
+            6(?:
+              [18]\d{2}|
+              2(?:
+                3(?:\d{2})?|
+                [46]\d{1,2}|
+                5\d{2}|
+                7\d
+              )|
+              5(?:
+                3\d?|
+                4\d|
+                [57]\d{1,2}|
+                6\d{2}|
+                8
+              )
+            )|
+            71\d{2}|
+            8(?:
+              [18]\d{2}|
+              23\d{2}|
+              54\d{2}
+            )|
+            9(?:
+              [18]\d{2}|
+              2[2-5]\d{2}|
+              53\d{1,2}
+            )
           )\d{3}|
           5(?:
-            (?:
-              [457-9]1|
-              62
+            02[03489]\d{2}|
+            1\d{2}|
+            2(?:
+              1\d{2}|
+              2(?:
+                2(?:\d{2})?|
+                [457]\d{2}
+              )
             )|
-            (?:
-              1\d? |
-              2[12]|
-              3[1-3]|
-              52
-            )\d|
-            61{2}
-          )|
+            3(?:
+              1\d{2}|
+              2(?:
+                [37](?:\d{2})?|
+                [569]\d{2}
+              )
+            )|
+            4(?:
+              1\d{2}|
+              2[46]\d{2}
+            )|
+            5(?:
+              1\d{2}|
+              26\d{1,2}
+            )|
+            6(?:
+              [18]\d{2}|
+              2|
+              53\d{2}
+            )|
+            7(?:
+              1|
+              24
+            )\d{2}|
+            8(?:
+              1|
+              26
+            )\d{2}|
+            91\d{2}
+          )\d{3}|
           6(?:
-            [45]1|
-            (?:
-              11|
-              2[15]|
-              [39]1
-            )\d|
-            (?:
-              [06-8]1|
-              62
-            )\d{2}
-          )|
-          7(?:
-            (?:
-              32|
-              91
+            0(?:
+              1\d{2}|
+              2(?:
+                3\d{2}|
+                4\d{1,2}
+              )
             )|
+            2(?:
+              2[2-5]\d{2}|
+              5(?:
+                [3-5]\d{2}|
+                7
+              )|
+              8\d{2}
+            )|
+            3(?:
+              1|
+              2[3478]
+            )\d{2}|
+            4(?:
+              1|
+              2[34]
+            )\d{2}|
+            5(?:
+              1|
+              2[47]
+            )\d{2}|
+            6(?:
+              [18]\d{2}|
+              6(?:
+                2(?:
+                  2\d|
+                  [34]\d{2}
+                )|
+                5(?:
+                  [24]\d{2}|
+                  3\d|
+                  5\d{1,2}
+                )
+              )
+            )|
+            72[2-5]\d{2}|
+            8(?:
+              1\d{2}|
+              2[2-5]\d{2}
+            )|
+            9(?:
+              1\d{2}|
+              2[2-6]\d{2}
+            )
+          )\d{3}|
+          7(?:
             (?:
               02|
-              31|
-              [67][12]
-            )\d|
-            [458]1\d{2}|
-            21\d{3}
+              [3-589]1|
+              6[12]|
+              72[24]
+            )\d{2}|
+            21\d{3}|
+            32
           )\d{3}|
           8(?:
             (?:
@@ -2238,6 +2419,17 @@
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>8001234567</exampleNumber>
       </tollFree>
+      <voip>
+        <nationalNumberPattern>
+          96(?:
+            0[49]|
+            1[0-4]|
+            6[69]
+          )\d{6}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <exampleNumber>9604123456</exampleNumber>
+      </voip>
       <shortCode>
         <nationalNumberPattern>
           1(?:
@@ -2344,10 +2536,12 @@
         <exampleNumber>12345678</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- Numbers beginning with 46 outside the ranges allocated by the plan have been included
+             since many were found online. -->
         <nationalNumberPattern>
           4(?:
             [679]\d|
-            8[3-9]
+            8[03-9]
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -2432,8 +2626,8 @@
           (?:
             6(?:
               [056]\d|
-              1[0-3]|
-              8[0-2]|
+              1[0-36-9]|
+              8[0-5]|
               90
             )|
             7(?:
@@ -2636,8 +2830,13 @@
             )\d|
             6(?:
               1[16]\d|
+              3(?:
+                00|
+                33|
+                6[16]
+              )|
               6(?:
-                [06]\d|
+                [069]\d|
                 3[03-9]|
                 44
               )|
@@ -3427,7 +3626,7 @@
     </territory>
 
     <!-- Belarus -->
-    <!-- http://eng.beltelecom.by/info/numbering/ -->
+    <!-- http://www.eng.beltelecom.by/en/subscribers/phone-codes -->
     <!-- Information on national prefix provided by a Belarussian person. -->
     <territory id="BY" countryCode="375" preferredInternationalPrefix="8~10"
                internationalPrefix="810" nationalPrefixForParsing="80?"
@@ -3479,7 +3678,7 @@
               5(?:
                 1[1-5]|
                 2\d|
-                6[1-4]|
+                6[2-4]|
                 9[1-7]
               )|
               6(?:
@@ -3632,18 +3831,19 @@
           (?:
             2(?:
               04|
-              26|
+              [23]6|
               [48]9|
               50
             )|
             3(?:
               06|
-              43
+              43|
+              65
             )|
             4(?:
               03|
               1[68]|
-              3[18]|
+              3[178]|
               5[06]
             )|
             5(?:
@@ -3655,6 +3855,7 @@
             6(?:
               0[04]|
               13|
+              39|
               47
             )|
             7(?:
@@ -3678,18 +3879,19 @@
           (?:
             2(?:
               04|
-              26|
+              [23]6|
               [48]9|
               50
             )|
             3(?:
               06|
-              43
+              43|
+              65
             )|
             4(?:
               03|
               1[68]|
-              3[18]|
+              3[178]|
               5[06]
             )|
             5(?:
@@ -3701,6 +3903,7 @@
             6(?:
               0[04]|
               13|
+              39|
               47
             )|
             7(?:
@@ -3798,7 +4001,7 @@
           1(?:
             80(?:
               0\d{2}
-            )? |
+            )?|
             3(?:
               00\d{2}
             )?
@@ -3839,6 +4042,10 @@
     <territory id="CD" countryCode="243" internationalPrefix="00"
                nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG">
       <availableFormats>
+        <numberFormat pattern="(\d{2})(\d{3})(\d{4})">
+          <leadingDigits>12</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
         <numberFormat pattern="([89]\d{2})(\d{3})(\d{3})">
           <leadingDigits>
             8[0-259]|
@@ -3857,15 +4064,20 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          [1-6]\d{6}|
-          8\d{6,8}|
+          [2-6]\d{6}|
+          [18]\d{6,8}|
           9\d{8}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{7,9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <nationalNumberPattern>[1-6]\d{6}</nationalNumberPattern>
-        <possibleNumberPattern>\d{7}</possibleNumberPattern>
+        <nationalNumberPattern>
+          1(?:
+            2\d{7}|
+            \d{6}
+          )|
+          [2-6]\d{6}
+        </nationalNumberPattern>
         <exampleNumber>1234567</exampleNumber>
       </fixedLine>
       <mobile>
@@ -4352,6 +4564,14 @@
           <leadingDigits>[48]00</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <!-- 95xxx shared cost numbers. Without this rule, the numbers will be formatted
+             incorrectly by the AsYouTypeFormatter because they overlap with area code 095x.
+             Note although ITU says the format is more like 95 xxx, in reality no space is used
+             when writing such numbers in China -->
+        <numberFormat pattern="(\d{5})">
+          <leadingDigits>95</leadingDigits>
+          <format>$1</format>
+        </numberFormat>
         <!-- Local numbers -->
         <!-- Chinese fixed-line numbers can be dialed from a cell phone without area code and they
              can be 7 to 8 digits. This rule is here to make formatting work with such numbers, as
@@ -4419,7 +4639,10 @@
               6[09]|
               91
             )|
-            898
+            8(?:
+              71|
+              98
+            )
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -4468,8 +4691,9 @@
             8(?:
               1[236-8]|
               2[5-7]|
-              [37]|
+              3|
               5[1-9]|
+              7[02-9]|
               8[3678]|
               9[1-7]
             )|
@@ -4496,27 +4720,35 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          [1-79]\d{7,11}|
-          8[0-357-9]\d{6,9}
+          [1-7]\d{7,11}|
+          8[0-357-9]\d{6,9}|
+          9(?:
+            5\d{3}|
+            \d{9}
+          )
         </nationalNumberPattern>
         <possibleNumberPattern>\d{4,12}</possibleNumberPattern>
       </generalDesc>
       <noInternationalDialling>
+        <!-- 95xxx numbers have been verified to be unreachable from overseas by placing actual
+             calls. -->
         <nationalNumberPattern>
           (?:
             4|
             (?:
               10
             )?8
-          )00\d{7}
+          )00\d{7}|
+          95\d{3}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{10,12}</possibleNumberPattern>
+        <possibleNumberPattern>\d{5,12}</possibleNumberPattern>
         <exampleNumber>4001234567</exampleNumber>
       </noInternationalDialling>
       <fixedLine>
         <!-- 0432 increased to 8 digits on October 24, 2009. 0791 increased to 8 digits on August
-             28, 2011. 0551 increased to 8 digits and 0565 was cancelled on Dec 8, 2012. 0475 is
-             the prefix for Tongliao but is not in the ITU data. -->
+             28, 2011. 0551 increased to 8 digits and 0565 was cancelled on Dec 8, 2012. 0871
+             increased to 8 digits on December 16, 2012. 0475 is the prefix for Tongliao but is not
+             in the ITU data. -->
         <nationalNumberPattern>
           21\d{8,10}|
           (?:
@@ -4544,7 +4776,10 @@
               6[09]|
               91
             )|
-            898
+            8(?:
+              71|
+              98
+            )
           )\d{8}|
           (?:
             3(?:
@@ -4591,8 +4826,9 @@
             8(?:
               1[236-8]|
               2[5-7]|
-              [37]\d|
+              3\d|
               5[1-9]|
+              7[02-9]|
               8[3678]|
               9[1-7]
             )|
@@ -4643,8 +4879,13 @@
         <exampleNumber>16812345</exampleNumber>
       </premiumRate>
       <sharedCost>
-        <nationalNumberPattern>400\d{7}</nationalNumberPattern>
-        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <!-- 95xxx numbers are covered by the ITU doc, but the following doc contains more info:
+             http://baike.baidu.com/view/3269670.htm -->
+        <nationalNumberPattern>
+          400\d{7}|
+          95\d{3}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{5}(?:\d{5})?</possibleNumberPattern>
         <exampleNumber>4001234567</exampleNumber>
       </sharedCost>
       <emergency>
@@ -4834,7 +5075,8 @@
               70[01]\d{3}
             )|
             1[01]\d{5}|
-            400\d{4}
+            400\d{4}|
+            70[0-2]\d{4}
           )|
           5100\d{4}
         </nationalNumberPattern>
@@ -4854,7 +5096,7 @@
               1[0-35-9]|
               37|
               [46]6|
-              75|
+              7[57]|
               8[79]|
               9[0-379]
             )|
@@ -4876,7 +5118,8 @@
               1[789]|
               2[02]|
               [67]7
-            )
+            )|
+            975
           )
         </nationalNumberPattern>
         <possibleNumberPattern>\d{4}</possibleNumberPattern>
@@ -5177,7 +5420,7 @@
           1(?:
             80(?:
               0\d{2}
-            )? |
+            )?|
             3(?:
               00\d{2}
             )?
@@ -5297,7 +5540,7 @@
              numbers are reachable by the public. -->
         <nationalNumberPattern>
           9(?:
-            5[056]|
+            5\d|
             7[234]
           )\d{6}
         </nationalNumberPattern>
@@ -5698,7 +5941,7 @@
     </territory>
 
     <!-- Denmark -->
-    <!-- http://en.itst.dk/telecom-internet-regulation/numbering-issues/numbering-lists -->
+    <!-- http://www.dba.erhvervsstyrelsen.dk/numbering-lists -->
     <territory id="DK" countryCode="45" internationalPrefix="00">
       <availableFormats>
         <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})">
@@ -5716,7 +5959,7 @@
           (?:
             [2-7]\d|
             8[126-9]|
-            9[16-9]
+            9[126-9]
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>32123456</exampleNumber>
@@ -5726,7 +5969,7 @@
           (?:
             [2-7]\d|
             8[126-9]|
-            9[16-9]
+            9[126-9]
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>20123456</exampleNumber>
@@ -6072,7 +6315,9 @@
       <mobile>
         <nationalNumberPattern>
           9(?:
-            [2-7]9|
+            39|
+            [4-6][89]|
+            7[7-9]|
             [89]\d
           )\d{6}
         </nationalNumberPattern>
@@ -6417,14 +6662,14 @@
       <!-- The following sections are copied verbatim from Morocco to allow these non-geographical
            numbers to be recognized as available from within Western Sahara. -->
       <mobile>
-        <!-- Prefixes 60[1-5], 62[47-9], 63[0458] and 68[01] are from numbers found online,
+        <!-- Prefixes 60[1-5], 62[47-9], 63[04-8] and 68[01] are from numbers found online,
              bug-reports, and information provided directly by the carriers. -->
         <nationalNumberPattern>
           6(?:
             0[0-6]|
             [14-7]\d|
             2[2-46-9]|
-            3[03458]|
+            3[03-8]|
             8[01]|
             99
           )\d{6}
@@ -7214,7 +7459,7 @@
 
     <!-- Gabon -->
     <!-- http://www.itu.int/oth/T020200004E/en -->
-    <territory id="GA" countryCode="241" internationalPrefix="00" leading_zero_possible="true"
+    <territory id="GA" countryCode="241" internationalPrefix="00" leadingZeroPossible="true"
                nationalPrefix="0">
       <availableFormats>
         <numberFormat pattern="(1)(\d{2})(\d{2})(\d{2})" nationalPrefixFormattingRule="$NP$FG">
@@ -8549,7 +8794,7 @@
           <format>$1 $2 $3 $4</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{2})(\d{2})(\d{2})">
-          <leadingDigits>62</leadingDigits>
+          <leadingDigits>6[02356]</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
       </availableFormats>
@@ -8574,11 +8819,9 @@
       </fixedLine>
       <mobile>
         <!-- WiMAX is in the plan - which is a wireless broadband protocol. Not including this in
-             the metadata for now unless this proves to be necessary. These would start with 79. We
-             are also allowing an extra digit for numbers beginning with 62, since Orange is
-             apparently moving their 62 and 68 ranges both to 62 and adding an extra digit.
-             Extra prefixes 24, 66 and 69 have been added for MTN Guinée, as notified by an
-             opensource contributor and matched by numbers found online. -->
+             the metadata for now unless this proves to be necessary. These would start with 79.
+             61[0-5] is assigned to Orange. Also includes the new 9-digit mobile numbers that are
+             coming into effect on March 29, 2013. -->
         <nationalNumberPattern>
           (?:
             24|
@@ -8590,13 +8833,20 @@
               3[3467]|
               5[2457-9]
             )|
-            2\d{2,3}|
+            1[0-5]\d|
+            2\d{2}|
             [4-9]\d{2}|
             3(?:
               [14]0|
               35
             )
-          )\d{4}
+          )\d{4}|
+          6(?:
+            [03]1|
+            2[128]|
+            5[57]|
+            6[2469]
+          )\d{6}
         </nationalNumberPattern>
         <exampleNumber>60201234</exampleNumber>
       </mobile>
@@ -8775,10 +9025,9 @@
             )|
             5(?:
               1\d|
-              2[1-3]|
+              [239][1-4]|
               4[124]|
-              5[1-6]|
-              [39][1-4]
+              5[1-6]
             )|
             6(?:
               1\d|
@@ -9848,9 +10097,8 @@
     </territory>
 
     <!-- Ireland -->
-    <!-- http://www.comreg.ie/_fileupload/publications/ComReg0802.pdf -->
-    <!-- http://www.comreg.ie/_fileupload/publications/ComReg0435.pdf -->
-    <!-- http://www.comreg.ie/_fileupload/publications/ComReg03147.pdf -->
+    <!-- http://www.comreg.ie/licensing_and_services/numbering_plan_for_ireland.552.440.html -->
+    <!-- http://www.comreg.ie/_fileupload/publications/ComReg1119.pdf -->
     <territory id="IE" countryCode="353" internationalPrefix="00"
                nationalPrefix="0" nationalPrefixFormattingRule="($NP$FG)">
       <availableFormats>
@@ -9860,11 +10108,11 @@
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{5})">
           <leadingDigits>
-            2[2-9]|
-            4[347]|
-            5[2-58]|
-            6[2-47-9]|
-            9[3-9]
+            2[24-9]|
+            47|
+            58|
+            6[237-9]|
+            9[35-9]
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
@@ -9930,25 +10178,20 @@
       </noInternationalDialling>
       <fixedLine>
         <!-- We allow 6-7 digit subscriber numbers for the 021 area code since that seems to be
-             reflected by the numbers in the Yellow Pages. The 023, 043, 052 and 064 area codes also
-             may have 7 digit subscriber numbers, although limited to 5 in the plan. This was caused
-             by a numbering update in 2008 (http://www.wtng.info/wtng-353-ie.html has more details).
-             Other changes not in the plan include consolidating 0502, 0506 and 0509 into 057 and
-             054, 055 and 053 into 053, and making 044 be followed by 7 digits in some cases.
-             Another peculiarity is that 048 actually replaces 00 44 28 when Irish people dial,
-             allowing them to easily dial Northern Ireland. We support these numbers here, although
-             technically they are numbers for the UK. -->
+             reflected by the numbers in the Yellow Pages. Another peculiarity is that 048 actually
+             replaces 00 44 28 when Irish people dial, allowing them to easily dial Northern
+             Ireland. We support these numbers here, although technically they are numbers for the
+             UK. -->
         <nationalNumberPattern>
           1\d{7,8}|
           2(?:
             1\d{6,7}|
-            [24-9]\d{5}|
-            3\d{5,7}
+            3\d{7}|
+            [24-9]\d{5}
           )|
           4(?:
             0[24]\d{5}|
-            [1269]\d{7}|
-            [34]\d{5,7}|
+            [1-469]\d{7}|
             5\d{6}|
             7\d{5}|
             8[0-46-9]\d{7}
@@ -9956,21 +10199,19 @@
           5(?:
             0[45]\d{5}|
             1\d{6}|
-            2\d{5,7}|
-            [3679]\d{7}|
+            [23679]\d{7}|
             8\d{5}
           )|
           6(?:
             1\d{6}|
-            4\d{5,7}|
             [237-9]\d{5}|
-            [56]\d{7}
+            [4-6]\d{7}
           )|
           7[14]\d{7}|
           9(?:
             1\d{6}|
             [04]\d{7}|
-            [3-9]\d{5}
+            [35-9]\d{5}
           )
         </nationalNumberPattern>
         <possibleNumberPattern>\d{5,10}</possibleNumberPattern>
@@ -9980,10 +10221,10 @@
         <nationalNumberPattern>
           8(?:
             22\d{6}|
-            [35-9]\d{7,8}
+            [35-9]\d{7}
           )
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{9,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>850123456</exampleNumber>
       </mobile>
       <tollFree>
@@ -9994,9 +10235,8 @@
       <premiumRate>
         <nationalNumberPattern>
           15(?:
-            1[2-9]|
+            1[2-8]|
             [2-8]0|
-            59|
             9[089]
           )\d{6}
         </nationalNumberPattern>
@@ -10023,6 +10263,11 @@
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>818123456</exampleNumber>
       </uan>
+      <voicemail>
+        <nationalNumberPattern>8[35-9]\d{8}</nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <exampleNumber>8501234567</exampleNumber>
+      </voicemail>
       <emergency>
         <nationalNumberPattern>
           112|
@@ -10333,7 +10578,7 @@
                4[0-389]|
                5[024-9]|
                6[0-35-9]|
-               7[03469]|
+               7[0346-9]|
                8[0-79]
              )|
              8(?:
@@ -10392,7 +10637,9 @@
                  3[5-9]|
                  42|
                  60|
-                 9[5-9]
+                 7[7-9]|
+                 8[1-9]|
+                 9[05-9]
                )|
                8(?:
                  [03][07-9]|
@@ -10813,8 +11060,9 @@
         <!-- A couple of additional prefixes found neither on the wikipedia page nor in the MSC
              codes list, are added because SMS messages have been successfully sent to these
              numbers. It seems almost impossible to know for some of these numbers whether they are
-             land-line or mobile, since the ranges overlap. Extra prefixes added: 822[1-689], 8299,
-             8309. -->
+             land-line or mobile, since the ranges overlap. Extra prefixes added: 8299, 8309.
+             New prefixes were added based on the document provided from mobile carriers:
+             https://code.google.com/p/libphonenumber/issues/detail?id=260 -->
         <nationalNumberPattern>
           (?:
             7(?:
@@ -10856,15 +11104,14 @@
               )|
               7(?:
                 0[27-9]|
-                [39][5-9]|
+                3[5-9]|
                 42|
-                60
+                6[03-9]|
+                [79]\d|
+                8[1-9]
               )|
               8(?:
-                [03][07-9]|
-                14|
-                2[7-9]|
-                [4-7]\d|
+                [0-7]\d|
                 9[013-9]
               )
             )|
@@ -11034,146 +11281,65 @@
           <leadingDigits>21</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(21)(\d{4})(\d{4})">
-          <leadingDigits>21</leadingDigits>
+        <numberFormat pattern="(2[16])(\d{4})(\d{4})">
+          <leadingDigits>2[16]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{3})(\d{3,4})">
           <leadingDigits>
             [13-9]|
             2[02-9]
-          </leadingDigits>
-          <format>$1 $2 $3</format>
-        </numberFormat>
-      </availableFormats>
-      <generalDesc>
-        <nationalNumberPattern>
-          [2-6]\d{4,9}|
-          9(?:
-            [1-4]\d{8}|
-            9\d{2,8}
-          )|
-          [178]\d{9}
-        </nationalNumberPattern>
-        <possibleNumberPattern>\d{4,10}</possibleNumberPattern>
-      </generalDesc>
-      <fixedLine>
-        <!-- The patterns here are organized such that numbers with variable lengths come first,
-             followed by numbers that are 10 digits long. -->
-        <nationalNumberPattern>
-          2(?:
-            1[2-9]\d{2,7}|
-            51\d{3,7}
-          )|
-          (?:
-            241|
-            3(?:
-              11|
-              51
-            )|
-            441|
-            5[14]1
-          )\d{4,7}|
-          (?:
-            3(?:
-              34|
-              41
-            )|
-            6(?:
-              11|
-              52
-            )
-          )\d{6,7}|
-          (?:
-            1(?:
-              [134589][12]|
-              [27][1-4]
-            )|
-            2(?:
-              2[189]|
-              [389][12]|
-              42|
-              5[256]|
-              6[1-59]|
-              7[34]
-            )|
-            3(?:
-              12|
-              2[1-4]|
-              3[125]|
-              4[24-9]|
-              5[23]|
-              [6-9][12]
-            )|
-            4(?:
-              [135-9][12]|
-              2[1-467]|
-              4[2-4]
-            )|
-            5(?:
-              12|
-              2[89]|
-              3[1-5]|
-              4[2-8]|
-              [5-7][12]|
-              8[1245]
-            )|
-            6(?:
-              12|
-              [347-9][12]|
-              51|
-              6[1-6]
-            )|
-            7(?:
-              [13589][12]|
-              2[1289]|
-              4[1-4]|
-              6[1-6]|
-              7[1-3]
-            )|
-            8(?:
-              [145][12]|
-              3[124578]|
-              6[1256]|
-              7[1245]
-            )
-          )\d{7}
+          </leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+      </availableFormats>
+      <generalDesc>
+        <nationalNumberPattern>
+          [14-8]\d{6,9}|
+          [23]\d{5,9}|
+          9(?:
+            [1-4]\d{8}|
+            9\d{2,8}
+          )
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{5,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{4,10}</possibleNumberPattern>
+      </generalDesc>
+      <fixedLine>
+        <nationalNumberPattern>
+          (?:
+            [145](?:
+              1[1-9]|
+              [2-9]\d
+            )\d{0,3}|
+            [23][1-9]\d{0,4}|
+            6[1-9]\d{1,4}|
+            [78]\d{2,5}
+          )\d{4}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{6,10}</possibleNumberPattern>
         <exampleNumber>2123456789</exampleNumber>
       </fixedLine>
       <mobile>
         <nationalNumberPattern>
-          9(?:
-            1(?:
-              [039]\d|
-              [16][1-35-9]|
-              2[1-8]|
-              4[013-9]|
-              [57][1-9]|
-              8[13-9]
-            )|
-            2[01]\d|
-            3(?:
-              [035-9]\d|
-              13|
-              2[1-579]|
-              47
-            )
-          )\d{6}
+          9[1-3]\d{8}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>9123456789</exampleNumber>
       </mobile>
       <pager>
-        <nationalNumberPattern>943[24678]\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>943\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>9432123456</exampleNumber>
       </pager>
       <!-- No tollFree or premiumRate information can be found. -->
       <voip>
         <!-- Includes VSAT and Boomehen Satellite numbers. -->
-        <nationalNumberPattern>993[12]\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>
+          (?:
+            [2-6]0\d|
+            993
+          )\d{7}
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>9932123456</exampleNumber>
       </voip>
@@ -11220,10 +11386,9 @@
         <nationalNumberPattern>
           (?:
             4(?:
-              1[0-245]|
+              [14][0-245]|
               2[0-7]|
               [37][0-8]|
-              4[0245]|
               5[0-3568]|
               6\d|
               8[0-36-8]
@@ -11235,7 +11400,7 @@
               3[013-7]|
               4[03-7]|
               7[0-2578]|
-              8[0-25-9]|
+              8[0-35-9]|
               9[013-689]
             )|
             87[23]
@@ -11259,7 +11424,8 @@
             )|
             7(?:
               5[057]|
-              7\d
+              7\d|
+              8[0-3]
             )|
             8(?:
               2[0-5]|
@@ -13059,7 +13225,7 @@
         <exampleNumber>601234567</exampleNumber>
       </personalNumber>
       <voip>
-        <nationalNumberPattern>50\d{8}</nationalNumberPattern>
+        <nationalNumberPattern>50[1-9]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>5012345678</exampleNumber>
       </voip>
@@ -13338,12 +13504,17 @@
         <!-- Adding 86 and 87 from numbers found online, along with 88 (the 88 numbers seem to be
              one digit longer as well.) Adding 97 followed by 7 digits as such numbers have been
              found online. Adding 14 as Mobitel have informed us they are using this prefix. Adding
-             60[1-9] based on information received from Beeline. -->
+             60[1-9] based on information received from Beeline. 76 numbers seem now to be 9 digits
+             long. -->
         <nationalNumberPattern>
           (?:
             (?:
               1\d|
-              [67][06-9]
+              6[06-9]|
+              7(?:
+                [07-9]|
+                6\d
+              )
             )[1-9]|
             8(?:
               0[89]|
@@ -13688,7 +13859,7 @@
               5[1-4]
             )|
             [68]0|
-            [3-6][1-9][2-9]
+            [3-6][1-9][1-9]
           </leadingDigits>
           <leadingDigits>
             1(?:
@@ -13700,7 +13871,7 @@
               )
             )|
             [68]0|
-            [3-6][1-9][2-9]
+            [3-6][1-9][1-9]
           </leadingDigits>
           <format>$1-$2-$3</format>
         </numberFormat>
@@ -13728,7 +13899,7 @@
           <format>$1-$2-$3-$4</format>
         </numberFormat>
         <numberFormat pattern="(\d)(\d{3,4})(\d{4})">
-          <leadingDigits>2[2-9]</leadingDigits>
+          <leadingDigits>2[1-9]</leadingDigits>
           <format>$1-$2-$3</format>
         </numberFormat>
         <numberFormat pattern="(\d)(\d{3,4})">
@@ -13782,25 +13953,33 @@
         <possibleNumberPattern>\d{4,10}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
+        <!-- We omit 049, supposedly for Kaesong Industrial Region, since real numbers can't be
+             found, and it is in North Korea anyway. We support 7-8 digits long subscriber numbers
+             starting with 1 based on evidence of real numbers found online. -->
         <nationalNumberPattern>
           (?:
             2|
-            [34][1-3]|
-            5[1-5]|
-            6[1-4]
+            3[1-3]|
+            [46][1-4]|
+            5[1-5]
           )(?:
             1\d{2,3}|
-            [2-9]\d{6,7}
+            [1-9]\d{6,7}
           )
         </nationalNumberPattern>
         <possibleNumberPattern>\d{4,10}</possibleNumberPattern>
         <exampleNumber>22123456</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>1[0-25-9]\d{7,8}</nationalNumberPattern>
+        <nationalNumberPattern>1[0-26-9]\d{7,8}</nationalNumberPattern>
         <possibleNumberPattern>\d{9,10}</possibleNumberPattern>
         <exampleNumber>1023456789</exampleNumber>
       </mobile>
+      <pager>
+        <nationalNumberPattern>15\d{7,8}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9,10}</possibleNumberPattern>
+        <exampleNumber>1523456789</exampleNumber>
+      </pager>
       <tollFree>
         <nationalNumberPattern>80\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -13893,27 +14072,26 @@
         <possibleNumberPattern>\d{7,8}</possibleNumberPattern>
         <exampleNumber>22345678</exampleNumber>
       </fixedLine>
-      <!-- Note that the mobile range starting 503 is not specified in the ITU documentation, but
-           can be found online as of Dec 2012. -->
       <mobile>
+        <!-- The mention of the mobile range 6933 0000 - 6969 9999 seems to be
+             a mistake in the ITU plan, and should be 6933 0000 - 6933 9999. -->
         <nationalNumberPattern>
           (?:
             5(?:
-              0[0-35-9]|
-              11|
-              5\d
+              1[0-2]|
+              [05]\d
             )|
             6(?:
               0[034679]|
               5[015-9]|
               6\d|
               7[067]|
-              9[069]
+              9[0369]
             )|
             9(?:
               0[09]|
               4[049]|
-              6[69]|
+              6[069]|
               [79]\d
             )
           )\d{5}
@@ -14504,7 +14682,6 @@
         <possibleNumberPattern>\d{7,9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Regular Cost services are included here as well. -->
         <nationalNumberPattern>
           (?:
             2(?:
@@ -14518,8 +14695,7 @@
               7[0135-7]|
               8[048]|
               9[0269]
-            )|
-            870
+            )
           )\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
@@ -14532,8 +14708,7 @@
             6(?:
               [01][0-4]|
               2[016-9]|
-              88|
-              92
+              88
             )|
             710
           )\d{5}|
@@ -14544,7 +14719,6 @@
             [7-9]\d
           )\d{4}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{7,9}</possibleNumberPattern>
         <exampleNumber>661234567</exampleNumber>
       </mobile>
       <!-- The prefix 809 seems to be used for AT&T and Verizon access lines from Liechtenstein,
@@ -14562,7 +14736,7 @@
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>8002222</exampleNumber>
       </tollFree>
-      <sharedCost>
+      <premiumRate>
         <nationalNumberPattern>
           90(?:
             0(?:
@@ -14581,12 +14755,12 @@
         </nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>9002222</exampleNumber>
-      </sharedCost>
+      </premiumRate>
       <uan>
         <nationalNumberPattern>
           87(?:
-            0[1289]|
-            70
+            0[128]|
+            7[0-4]
           )\d{3}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
@@ -14639,7 +14813,7 @@
             1[278]|
             44
           )
-          </nationalNumberPattern>
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>112</exampleNumber>
       </emergency>
@@ -14733,16 +14907,13 @@
       <mobile>
         <!-- According to information from Lonestar Communications Corporation, the prefix 6 is
              being removed, but as of June 2012 is in parallel running with their new prefix 88.
-             It seems some numbers beginning with 77[67] are also 9 digits long now. -->
+             According to Cellcom Liberia, they have issued 9 digit numbers starting with 77. -->
         <nationalNumberPattern>
           (?:
             4[67]|
             5\d|
             6[4-8]|
-            7(?:
-              7[67]\d|
-              \d{2}
-            )|
+            77?\d{2}|
             88\d{2}
           )\d{5}
         </nationalNumberPattern>
@@ -15303,14 +15474,14 @@
       </fixedLine>
       <!-- Also duplicated in Western Sahara, please ensure you update both. -->
       <mobile>
-        <!-- Prefixes 60[1-5], 62[47-9], 63[0458] and 68[01] are from numbers found online,
+        <!-- Prefixes 60[1-5], 62[47-9], 63[04-8] and 68[01] are from numbers found online,
              bug-reports, and information provided directly by the carriers. -->
         <nationalNumberPattern>
           6(?:
             0[0-6]|
             [14-7]\d|
             2[2-46-9]|
-            3[03458]|
+            3[03-8]|
             8[01]|
             99
           )\d{6}
@@ -15717,7 +15888,12 @@
       <mobile>
         <!-- The numbering plan suggests the third digit, Z, should be 24-9, but this is not borne
              out by reality. -->
-        <nationalNumberPattern>3[02-4]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>
+          3(?:
+            [02-4]\d|
+            90
+          )\d{6}
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>301234567</exampleNumber>
       </mobile>
@@ -16658,7 +16834,8 @@
         <exampleNumber>2012345</exampleNumber>
       </fixedLine>
       <mobile>
-        <!--Adding 92 as SMS messages have been successfully sent to this prefix. -->
+        <!--Adding 92 as SMS messages have been successfully sent to this prefix. 820 has also been
+            added based on a report from Orange. -->
         <nationalNumberPattern>
           (?:
             25\d|
@@ -16667,7 +16844,10 @@
               9\d
             )|
             7\d{2}|
-            87[15-8]|
+            8(?:
+              20|
+              7[15-8]
+            )|
             9[1-8]\d
           )\d{4}
         </nationalNumberPattern>
@@ -16773,12 +16953,13 @@
       </fixedLine>
       <mobile>
         <!-- 7[45] has been added as many numbers online have been found with this prefix. 46[46]
-             are new prefixes for Dhiraagu and Wataniya, used currently for SMS-based services. -->
+             are new prefixes for Dhiraagu and Wataniya, used currently for SMS-based services.
+             91 was added based on information from Wataniya Telecom. -->
         <nationalNumberPattern>
           (?:
             46[46]|
             7[3-9]\d|
-            9[6-9]\d
+            9[16-9]\d
           )\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
@@ -17157,20 +17338,23 @@
       <fixedLine>
         <nationalNumberPattern>
           (?:
-            3\d{2}|
-            [4-79]\d|
-            8[2-9]
+            3[2-9]\d|
+            [4-9][2-9]
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
-        <exampleNumber>312345678</exampleNumber>
+        <exampleNumber>323456789</exampleNumber>
       </fixedLine>
       <mobile>
         <nationalNumberPattern>
           1(?:
-            [02-46-9][2-9]|
-            1[12]\d
-          )\d{6}
+            1[1-3]\d{2}|
+            [02-4679][2-9]\d|
+            8(?:
+              1[23]|
+              [2-9]\d
+            )
+          )\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9,10}</possibleNumberPattern>
         <exampleNumber>123456789</exampleNumber>
@@ -17253,9 +17437,9 @@
            a 9 are premium rate, but no online examples can be found of any of these so they are
            omitted for the time-being. -->
       <shortCode>
-        <nationalNumberPattern>1[0234]\d</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
-        <exampleNumber>101</exampleNumber>
+        <nationalNumberPattern>1[02-5]\d{2}</nationalNumberPattern>
+        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+        <exampleNumber>1011</exampleNumber>
       </shortCode>
       <emergency>
         <!-- 11X is national, 19X is for Maputo. -->
@@ -18304,12 +18488,14 @@
         <possibleNumberPattern>\d{7,11}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
+        <!-- 07 788 was assigned to Voxbox according to
+             http://www.nad.org.nz/07GeographicalCodes.php -->
         <nationalNumberPattern>
           (?:
             3[2-79]|
             [49][2-689]|
             6[235-9]|
-            7[2-589]
+            7[2-5789]
           )\d{6}|
           24099\d{3}
         </nationalNumberPattern>
@@ -18421,7 +18607,7 @@
     </territory>
 
     <!-- Panama -->
-    <!-- http://www.asep.gob.pa/telecom/pnn/default.asp - last read June 6th 2012. -->
+    <!-- http://www.asep.gob.pa/telecom/pnn/default.asp - last read Jan 17th 2013. -->
     <!-- http://en.wikipedia.org/wiki/%2B507 - although it omits the fact that mobile phones are 8
          digits long. -->
     <territory id="PA" countryCode="507" internationalPrefix="00">
@@ -18534,8 +18720,8 @@
           6(?:
             [04-9]\d|
             1[0-5]|
-            2[0-6]|
-            3[6-9]
+            2[0-7]|
+            3[5-9]
           )\d{5}
         </nationalNumberPattern>
         <exampleNumber>60012345</exampleNumber>
@@ -18668,16 +18854,24 @@
     <!-- http://www.itu.int/oth/T020200004D/en -->
     <territory id="PF" countryCode="689" internationalPrefix="00">
       <availableFormats>
+        <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})">
+          <leadingDigits>89</leadingDigits>
+          <format>$1 $2 $3 $4</format>
+        </numberFormat>
         <numberFormat pattern="(\d{2})(\d{2})(\d{2})">
           <format>$1 $2 $3</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[2-9]\d{5}</nationalNumberPattern>
-        <possibleNumberPattern>\d{6}</possibleNumberPattern>
+        <nationalNumberPattern>
+          [2-79]\d{5}|
+          8\d{5,7}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{6}(?:\d{2})?</possibleNumberPattern>
       </generalDesc>
       <noInternationalDialling>
         <nationalNumberPattern>44\d{4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{6}</possibleNumberPattern>
         <exampleNumber>441234</exampleNumber>
       </noInternationalDialling>
       <fixedLine>
@@ -18692,6 +18886,7 @@
             [5689]\d{2}
           )\d{3}
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{6}</possibleNumberPattern>
         <exampleNumber>401234</exampleNumber>
       </fixedLine>
       <mobile>
@@ -18699,7 +18894,8 @@
           (?:
             [27]\d{2}|
             3[0-79]\d|
-            411
+            411|
+            89\d{3}
           )\d{3}
         </nationalNumberPattern>
         <exampleNumber>212345</exampleNumber>
@@ -18884,8 +19080,11 @@
         <format>$1 $2 $3</format>
       </numberFormat>
       <numberFormat nationalPrefixFormattingRule="$NP$FG"
-        pattern="(9\d{2})(\d{3})(\d{4})">
-        <leadingDigits>9</leadingDigits>
+        pattern="(\d{3})(\d{3})(\d{4})">
+        <leadingDigits>
+          81|
+          9
+        </leadingDigits>
         <format>$1 $2 $3</format>
       </numberFormat>
       <!-- Formatting from http://www.uniontelecard.com/calling-guides/philippines/guide1.aspx -->
@@ -18921,17 +19120,19 @@
       <exampleNumber>21234567</exampleNumber>
     </fixedLine>
     <mobile>
-      <!-- Adding Sun prefixes 94[23] based on http://en.wikipedia.org/wiki/Sun_Cellular -->
       <nationalNumberPattern>
-        9(?:
-          0[5-9]|
-          1[025-9]|
-          2[0-36-9]|
-          3[02-9]|
-          4[236-9]|
-          7[349]|
-          89|
-          9[49]
+        (?:
+          81[37]|
+          9(?:
+            0[5-9]|
+            1[025-9]|
+            2[0-35-9]|
+            3[02-9]|
+            4[236-9]|
+            7[3479]|
+            89|
+            9[46-9]
+          )
         )\d{7}
       </nationalNumberPattern>
       <possibleNumberPattern>\d{10}</possibleNumberPattern>
@@ -19599,30 +19800,41 @@
         <nationalNumberPattern>
           9(?:
             [136]\d{2}|
-            2[124-79]\d|
-            4(?:
-              80|
-              9\d
-            )
+            2[0-79]\d|
+            480
           )\d{5}
         </nationalNumberPattern>
         <exampleNumber>912345678</exampleNumber>
       </mobile>
       <tollFree>
-        <nationalNumberPattern>
-          4\d{8}|
-          80[02]\d{6}
-        </nationalNumberPattern>
+        <nationalNumberPattern>80[02]\d{6}</nationalNumberPattern>
         <exampleNumber>800123456</exampleNumber>
       </tollFree>
       <premiumRate>
-        <nationalNumberPattern>71\d{7}</nationalNumberPattern>
-        <exampleNumber>712345678</exampleNumber>
+        <!-- Fixed maximum cost numbers: 761=0.60€, 761=1€, 762=2€. -->
+        <nationalNumberPattern>
+          76(?:
+            0[1-57]|
+            1[2-47]|
+            2[237]
+          )\d{5}
+        </nationalNumberPattern>
+        <exampleNumber>760123456</exampleNumber>
       </premiumRate>
       <sharedCost>
-        <nationalNumberPattern>808\d{6}</nationalNumberPattern>
+        <!-- 808 are priced as local calls, 809 are national calls. -->
+        <nationalNumberPattern>
+          80(?:
+            8\d|
+            9[1579]
+          )\d{5}
+        </nationalNumberPattern>
         <exampleNumber>808123456</exampleNumber>
       </sharedCost>
+      <personalNumber>
+        <nationalNumberPattern>884[128]\d{5}</nationalNumberPattern>
+        <exampleNumber>884123456</exampleNumber>
+      </personalNumber>
       <voip>
         <nationalNumberPattern>30\d{7}</nationalNumberPattern>
         <exampleNumber>301234567</exampleNumber>
@@ -19631,9 +19843,9 @@
         <nationalNumberPattern>
           70(?:
             7\d|
-            8[147]
+            8[17]
           )\d{5}
-          </nationalNumberPattern>
+        </nationalNumberPattern>
         <exampleNumber>707123456</exampleNumber>
       </uan>
       <emergency>
@@ -20755,7 +20967,7 @@
             (?:
               2[0-7]|
               4[0136-8]|
-              5[0-38]|
+              5[0138]|
               7[018]|
               8[01]|
               9[0-57]
@@ -20786,11 +20998,10 @@
           )|
           5(?:
             0[0-6]|
-            1[0-5]|
+            [15][0-5]|
             2[0-68]|
             3[0-4]|
             4\d|
-            5[0-5]|
             6[03-5]|
             7[013]|
             8[0-79]|
@@ -20816,11 +21027,9 @@
               1[0-68]|
               2\d|
               3[02-59]|
-              4[0-4]|
-              5[0-4]|
-              6[01]|
-              7[0135-8]|
-              8[01]
+              [45][0-4]|
+              [68][01]|
+              7[0135-8]
             )\d{5,6}
           )
         </nationalNumberPattern>
@@ -20828,10 +21037,15 @@
         <exampleNumber>8123456</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>7[02-46]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>7[0236]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>701234567</exampleNumber>
       </mobile>
+      <pager>
+        <nationalNumberPattern>74\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>741234567</exampleNumber>
+      </pager>
       <tollFree>
         <nationalNumberPattern>20\d{4,7}</nationalNumberPattern>
         <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
@@ -20869,8 +21083,8 @@
     </territory>
 
     <!-- Singapore -->
-    <!-- http://www.ida.gov.sg/policies%20and%20regulation/20060508120124.aspx -->
-    <territory id="SG" countryCode="65" internationalPrefix="0[0-3][0-9]">
+    <!-- http://www.ida.gov.sg/Policies-and-Regulations/Industry-and-Licensees/Numbering/National-Numbering-Plan-and-Allocation-Process.aspx -->
+    <territory id="SG" countryCode="65" internationalPrefix="0[0-3]\d">
       <availableFormats>
         <numberFormat pattern="([3689]\d{3})(\d{4})">
           <leadingDigits>
@@ -20927,7 +21141,7 @@
         <exampleNumber>19001234567</exampleNumber>
       </premiumRate>
       <voip>
-        <nationalNumberPattern>3[0-2]\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>3[12]\d{6}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>31234567</exampleNumber>
       </voip>
@@ -20943,19 +21157,18 @@
         <nationalNumberPattern>
           1(?:
             [0136]\d{2}|
-            41\d|
             [89](?:
               [1-9]\d|
               0[1-9]
             )|
             [57]\d{2,3})|
-          99[0-46-8]
+          99[0246-8]
         </nationalNumberPattern>
         <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
         <exampleNumber>1312</exampleNumber>
       </shortCode>
       <emergency>
-        <nationalNumberPattern>99[59]</nationalNumberPattern>
+        <nationalNumberPattern>99[359]</nationalNumberPattern>
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>999</exampleNumber>
       </emergency>
@@ -21535,7 +21748,8 @@
       <mobile>
         <!-- 24 is used by the carrier Telesom. 28 is used by Nationlink. 6[89] are apparently used
              by Nationlink Somalia, 67 by Nationlink Puntland, and 61 by Hormuud. 7X is used by
-             Somtel. 6 followed by only 7 digits is used by Telecom. -->
+             Somtel. 6 followed by only 7 digits is used by Telecom. We have received information
+             from Golis Telecom that 90 numbers are extended by 1 digit by becoming 907. -->
         <nationalNumberPattern>
           (?:
             15\d|
@@ -21545,10 +21759,13 @@
             )|
             6[17-9]?\d{2}|
             7\d{2}|
-            9[01]\d
+            9(?:
+              07|
+              1
+            )\d
           )\d{5}
         </nationalNumberPattern>
-        <exampleNumber>90792024</exampleNumber>
+        <exampleNumber>907792024</exampleNumber>
       </mobile>
       <!-- According to the following webpage, there is no emergency number in Somalia:
            http://www.netglobers.com/africa/somalia-emergency-numbers-in-somalia.html -->
@@ -22060,10 +22277,10 @@
       <mobile>
         <!-- Sotel Tchad "SALAM" (77 XX XX XX) is classified as a fixed operator in the plan, but it
              also says numbers starting with 7 are mobile numbers. Putting under mobile for now.
-             Also adding 63[5-9] from evidence of successful SMS delivery. -->
+             Also adding 6[028] and 63[5-9] which are operated by Airtel. -->
         <nationalNumberPattern>
           (?:
-            6[36]\d|
+            6[02368]\d|
             77\d|
             9(?:
               5[0-4]|
@@ -22367,7 +22584,7 @@
         <exampleNumber>2112345</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>7[78][1-9]\d{5}</nationalNumberPattern>
+        <nationalNumberPattern>7[78]\d{6}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>77212345</exampleNumber>
       </mobile>
@@ -22501,10 +22718,14 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
+        <!-- We support the whole 81 prefix here instead of just 81200 as
+             indicated in the ITU doc, as more real phone numbers have been
+             found online. -->
         <nationalNumberPattern>
           (?:
             3[012]|
-            7\d
+            7\d|
+            81
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>71234567</exampleNumber>
@@ -22521,7 +22742,7 @@
       <!-- These are listed as 'value added services' - pending further information, we add them
            here for now. -->
       <premiumRate>
-        <nationalNumberPattern>8[0128]\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>8[028]\d{6}</nationalNumberPattern>
         <exampleNumber>80123456</exampleNumber>
       </premiumRate>
       <emergency>
@@ -22755,7 +22976,10 @@
         <!-- Adding 703 as messages have been successfully delivered to phones with this prefix. -->
         <nationalNumberPattern>
           868(?:
-            29\d|
+            2(?:
+              8[59]|
+              9\d
+            )|
             3(?:
               0[1-9]|
               1[02-9]|
@@ -22985,9 +23209,9 @@
              area code - http://www.ua.all-biz.info/guide/phonecodes is useful but not error-free.
              Have used local yellow pages guidelines, Google searches and regression tests to
              reverse-engineer these rules as well as bugs. -->
-        <numberFormat pattern="([3-69]\d)(\d{3})(\d{4})">
+        <numberFormat pattern="([3-689]\d)(\d{3})(\d{4})">
           <leadingDigits>
-            39|
+            [38]9|
             4(?:
               [45][0-5]|
               87
@@ -23001,7 +23225,7 @@
             9[1-9]
           </leadingDigits>
           <leadingDigits>
-            39|
+            [38]9|
             4(?:
               [45][0-5]|
               87
@@ -23032,7 +23256,7 @@
               [12][29]|
               5[24]
             )|
-            8|
+            8[0-8]|
             90
           </leadingDigits>
           <leadingDigits>
@@ -23050,7 +23274,7 @@
               [12][29]|
               5[24]
             )|
-            8|
+            8[0-8]|
             90
           </leadingDigits>
           <format>$1 $2 $3</format>
@@ -23148,6 +23372,12 @@
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>900123456</exampleNumber>
       </premiumRate>
+      <!-- Added based on: http://www.didx.net/did/ShowCountry/Country/AreaDesc/Area/9442 -->
+      <voip>
+        <nationalNumberPattern>89\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>891234567</exampleNumber>
+      </voip>
       <emergency>
         <nationalNumberPattern>
           1(?:
@@ -23170,7 +23400,7 @@
           <leadingDigits>
             [7-9]|
             20(?:
-              [013-5]|
+              [013-8]|
               2[5-9]
             )|
             4(?:
@@ -23200,16 +23430,18 @@
         <possibleNumberPattern>\d{5,9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Ranges with prefixes 20[35] are "not yet operational" as of Feb. 2012. -->
+        <!-- Ranges with prefixes 20[5-8] are "not yet operational" as of Feb. 2013. -->
         <nationalNumberPattern>
           20(?:
-            [014]\d{2}|
+            [0147]\d{2}|
             2(?:
               40|
               [5-9]\d
             )|
             3[23]\d|
-            5[0-4]\d
+            5[0-4]\d|
+            60\d|
+            8[0-2]\d
           )\d{4}|
           [34]\d{8}
         </nationalNumberPattern>
@@ -23220,12 +23452,12 @@
       </fixedLine>
       <mobile>
         <!-- Added 79[5-9] and 707 from online numbers found with this prefix. -->
-        <!-- Ranges with prefixes 7[246] are "not yet operational" as of Nov. 2011. -->
+        <!-- Ranges with prefixes 7[2346] are "not yet operational" as of Jan. 2013. -->
         <nationalNumberPattern>
           7(?:
             0[0-7]|
             [15789]\d|
-            20|
+            [23]0|
             [46][0-4]
           )\d{6}
         </nationalNumberPattern>
@@ -23367,7 +23599,7 @@
             )
           )[2-9]\d{6}
         </nationalNumberPattern>
-        <exampleNumber>2015550123</exampleNumber>
+        <exampleNumber>2015555555</exampleNumber>
       </fixedLine>
       <mobile>
         <nationalNumberPattern>
@@ -23459,7 +23691,7 @@
             )
           )[2-9]\d{6}
         </nationalNumberPattern>
-        <exampleNumber>2015550123</exampleNumber>
+        <exampleNumber>2015555555</exampleNumber>
       </mobile>
       <tollFree>
         <nationalNumberPattern>
@@ -24942,6 +25174,52 @@
           <leadingDigits>86[24]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <!-- Three-digit area codes (listed before the two-digit ones since some overlap) -->
+        <numberFormat pattern="([2356]\d{2})(\d{3,5})">
+          <leadingDigits>
+            2(?:
+              [278]|
+              0[45]|
+              [49]8
+            )|
+            3(?:
+              08|
+              17|
+              3[78]|
+              [78]
+            )|
+            5[15][78]|
+            6(?:
+              [29]8|
+              37|
+              [68][78]
+            )
+          </leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{3})(\d{3,4})">
+          <leadingDigits>
+            2(?:
+              [278]|
+              0[45]|
+              48
+            )|
+            3(?:
+              08|
+              17|
+              3[78]|
+              [78]
+            )|
+            5[15][78]|
+            6(?:
+              [29]8|
+              37|
+              [68][78]
+            )|
+            80
+          </leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
         <!-- Two-digit area codes -->
         <numberFormat pattern="([1-356]\d)(\d{3,5})">
           <leadingDigits>
@@ -24997,51 +25275,6 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <!-- Three-digit area codes -->
-        <numberFormat pattern="([2356]\d{2})(\d{3,5})">
-          <leadingDigits>
-            2(?:
-              [278]|
-              0[45]|
-              48
-            )|
-            3(?:
-              08|
-              17|
-              3[78]|
-              [78]
-            )|
-            5[15][78]|
-            6(?:
-              [29]8|
-              37|
-              [68][78]
-            )
-          </leadingDigits>
-          <format>$1 $2</format>
-        </numberFormat>
-        <numberFormat pattern="([2356]\d{2})(\d{3})(\d{3})">
-          <leadingDigits>
-            2(?:
-              [278]|
-              0[45]|
-              48
-            )|
-            3(?:
-              08|
-              17|
-              3[78]|
-              [78]
-            )|
-            5[15][78]|
-            6(?:
-              [29]8|
-              37|
-              [68][78]
-            )
-          </leadingDigits>
-          <format>$1 $2 $3</format>
-        </numberFormat>
         <!-- Four-digit area codes -->
         <numberFormat pattern="([25]\d{3})(\d{3,5})">
           <leadingDigits>
@@ -25071,7 +25304,7 @@
         </numberFormat>
         <!-- VOIP numbers -->
         <numberFormat pattern="(8\d{3})(\d{6})">
-          <leadingDigits>86[1389]</leadingDigits>
+          <leadingDigits>86</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
       </availableFormats>
@@ -25084,7 +25317,7 @@
             6\d{3,6}
           )|
           [13-79]\d{4,8}|
-          86\d{8}
+          8[06]\d{8}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{3,10}</possibleNumberPattern>
       </generalDesc>
@@ -25140,9 +25373,12 @@
             6[126-8]
           )\d{4,6}|
           2(?:
-            0|
-            70
-          )\d{5,6}|
+            (?:
+              0|
+              70
+            )\d{5,6}|
+            2[05]\d{7}
+          )|
           (?:
             4\d|
             9[2-8]
@@ -25154,7 +25390,7 @@
            also being used by the carriers as mobile prefixes. -->
       <mobile>
         <nationalNumberPattern>
-          7[137]\d{7}|
+          7[1378]\d{7}|
           86(?:
             22|
             44
@@ -25163,12 +25399,19 @@
         <possibleNumberPattern>\d{9,10}</possibleNumberPattern>
         <exampleNumber>711234567</exampleNumber>
       </mobile>
-      <!-- No tollFree or premiumRate information can be found. -->
+      <tollFree>
+        <nationalNumberPattern>800\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <exampleNumber>8001234567</exampleNumber>
+      </tollFree>
+      <!-- No premiumRate information can be found. -->
       <voip>
         <nationalNumberPattern>
           86(?:
             1[12]|
             30|
+            55|
+            77|
             8[367]|
             99
           )\d{6}