phonelib 0.2.7 → 0.2.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0ff01b459bd1e85094346f7d122ecd50c4767dc8
+  data.tar.gz: 437a1259ac26e6aa385dd5e1135eac3c11416f3c
+SHA512:
+  metadata.gz: 034361056395d337e3e0762bb039d46db01b930c50859b65f15cfa1f4b4b9384588934f909450abdeabd6220eb5bd1a34972221639e6ffa095608c442d46c81d
+  data.tar.gz: c29cd9f483a4cb2e0418e48faf7e63df5e6811006f93f61a4841bede73c3a0862c0865ef8ac0e03804a7915f4d36ba8d8941f7d0a975fc7214099d816b4e372b

data/Rakefile

@@ -1,36 +1,36 @@
-#!/usr/bin/env rake
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
+Bundler.require
+
 begin
+  # can't do anything to make build pass on ruby 1.9.2
   require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Phonelib'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  RDoc::Task.new(:rdoc) do |rdoc|
+    rdoc.rdoc_dir = 'rdoc'
+    rdoc.title    = 'Phonelib'
+    rdoc.options << '--line-numbers'
+    rdoc.rdoc_files.include('README.rdoc')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+  end
+rescue
+  puts 'Running without rdoc tasks'
 end
 
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |t|
+  if defined? Rails
+    puts 'Rails found! Running tests with Rails'
+    t.pattern = 'spec/**/*_spec.rb'
+  else
+    puts 'Rails not found! Running tests without Rails'
+    t.pattern = 'spec/*_spec.rb'
+  end
 end
-
-task :default => :test
+task :default => :spec
 
 load 'tasks/phonelib_tasks.rake'

data/data/PhoneNumberMetaData.xml

@@ -13,7 +13,6 @@
      limitations under the License.
 
      @author: Shaopeng Jia
-     @author: Lara Rennie
 
      Metadata on Phone Number Plan and formatting rules
      Note: Territories are in alphabetical order by their IDs, which are based on ISO 3166-1
@@ -309,6 +308,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -383,6 +383,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -938,11 +939,6 @@
           <format>$1</format>
           <intlFormat>NA</intlFormat>
         </numberFormat>
-        <numberFormat pattern="(\d{2})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>0</leadingDigits>
-          <format>$1</format>
-          <intlFormat>NA</intlFormat>
-        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
@@ -1130,6 +1126,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -1466,10 +1463,11 @@
             [0-2]\d|
             3[0-57-9]|
             4[47-9]|
-            5[0-35-9]|
+            5[0-25-9]|
             6[6-9]|
-            [79][07-9]|
-            8[17-9]
+            7[0457-9]|
+            8[17-9]|
+            9[07-9]
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -1859,6 +1857,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -2043,7 +2042,7 @@
                 3|
                 4\d
               )
-            )|
+            )
           )\d{3}|
           4(?:
             0(?:
@@ -2303,7 +2302,7 @@
         <numberFormat pattern="([15-8]\d)(\d{2})(\d{2})(\d{2})">
           <leadingDigits>
             [156]|
-            7[0178]|
+            7[018]|
             8(?:
               0[1-9]|
               [1-79]
@@ -2326,21 +2325,17 @@
         <possibleNumberPattern>\d{8,9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Note that 80 is a valid area code, so we explicitly check for this case that the third
-             digit begins with 1-9 -->
+        <!-- According to the published Excel document the third digit must be 1-9. -->
         <nationalNumberPattern>
           (?:
             1[0-69]|
-            [23][2-8]|
             [49][23]|
             5\d|
             6[013-57-9]|
-            71
-          )\d{6}|
-          8(?:
-            0[1-9]|
-            [1-79]\d
-          )\d{5}
+            71|
+            8[0-79]
+          )[1-9]\d{5}|
+          [23][2-8]\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>12345678</exampleNumber>
@@ -2365,9 +2360,9 @@
       <premiumRate>
         <nationalNumberPattern>
           (?:
-            90|
-            7[07]
-          )\d{6}
+            70[2-7]|
+            90\d
+          )\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>90123456</exampleNumber>
@@ -2398,11 +2393,6 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- The prefix 50 48 has been added based on numbers found online, while 40 49 has been
-             deleted since we haven't found any numbers with this prefix and it is not mentioned in
-             the Onatel document.
-             IMPORTANT: Note that the ITU documents of Mar/Apr 2013 seem to have major errors in the
-             fixed-line table, so we have not changed our patterns based on these. -->
         <nationalNumberPattern>
           (?:
             20(?:
@@ -2411,11 +2401,14 @@
               9[016-9]
             )|
             40(?:
-              4[56]|
+              4[569]|
               5[4-6]|
               7[0179]
             )|
-            50[34]\d
+            50(?:
+              [34]\d|
+              50
+            )
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>20491234</exampleNumber>
@@ -2423,9 +2416,9 @@
       <mobile>
         <nationalNumberPattern>
           6(?:
-            [0-24-6]\d|
-            8[0-5]|
-            3[0-3]|
+            [0-24-68]\d|
+            3[0-7]|
+            70
           )\d{5}|
           7\d{7}
         </nationalNumberPattern>
@@ -2554,7 +2547,6 @@
 
     <!-- Bahrain -->
     <!-- http://www.itu.int/oth/T0202000011/en -->
-    <!-- http://www.tra.org.bh/en/pdf/National_Numbering_Plan_2.pdf -->
     <!-- http://www.tra.org.bh/en/marketNumbering.aspx -->
     <!-- http://en.wikipedia.org/wiki/Telephone_numbers_in_Bahrain -->
     <territory id="BH" countryCode="973" internationalPrefix="00" mobileNumberPortableRegion="true">
@@ -2567,11 +2559,12 @@
         <nationalNumberPattern>[136-9]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
-      <!-- Universal Service numbers are under both Mobile and Fixed-Line, as they can be assigned
-           to either. -->
+      <!-- Some ranges were previously described as "universal", but in subsequent versions of the
+           ITU doc they have been specified to be mobile or fixed-line. We follow the ITU
+           designations, even though some publications still refer to them as universal. -->
       <!-- According to http://en.wikipedia.org/wiki/Telephone_numbers_in_Bahrain, the ranges
-           "6966-6969, 6996, 6999" are assigned to Rapid. However this contradicts our ranges of
-           "6966, 6969, 6996-6999". TODO: Investigate this further. -->
+           "6966-6969, 6996, 6999" are assigned to Rapid. However this contradicts the ITU doc
+           which lists "6966, 6969, 6996, 6999". We follow ITU here. -->
       <fixedLine>
         <nationalNumberPattern>
           (?:
@@ -2582,16 +2575,14 @@
             )\d|
             6(?:
               1[16]\d|
+              500|
               6(?:
                 0\d|
                 3[12]|
                 44|
                 88
               )|
-              9(?:
-                6[69]|
-                9[6-9]
-              )
+              9[69][69]
             )|
             7(?:
               7\d{2}|
@@ -2601,41 +2592,27 @@
         </nationalNumberPattern>
         <exampleNumber>17001234</exampleNumber>
       </fixedLine>
-      <!-- Previously 6644 was assigned to Universal Service, along with 6111, 6160, 6500, 6600,
-           6688, 6969, 6996, 6999, and 77. These were put under both Mobile and Fixed-Line, as they
-           could be assigned to either. However, in the new document these are assigned to
-           Fixed-Line only (with the exception of 6644 which was removed). For now we are keeping
-           these number in both sections.
-           Note also that 31 is not listed in the ITU document and could probably be removed.
-           TODO: Check above ranges and move/remove ranges where necessary.-->
+      <!-- 31 is assigned to Royal Court, as per documents on Bahrain's own telecom site, even
+           though it is omitted from the ITU document. -->
       <mobile>
         <nationalNumberPattern>
           (?:
             3(?:
               [1-4679]\d|
               5[0135]|
-              8[348]
+              8[0-48]
             )\d|
             6(?:
-              1[16]\d|
               3(?:
                 00|
                 33|
                 6[16]
               )|
-              500|
               6(?:
-                [069]\d|
-                3[03-9]|
-                44|
-                88
-              )|
-              9(?:
-                6[69]|
-                9[6-9]
+                [69]\d|
+                3[03-9]
               )
-            )|
-            77\d{2}
+            )
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>36001234</exampleNumber>
@@ -2843,6 +2820,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -2956,7 +2934,7 @@
         <nationalNumberPattern>
           (?:
             318[023]|
-            416[0239]|
+            416[023]|
             7(?:
               1[578]|
               50
@@ -2968,13 +2946,14 @@
       <mobile>
         <nationalNumberPattern>
           (?:
-            318[1456]|
-            416[15-8]|
+            318[14-68]|
+            416[15-9]|
             7(?:
               0[01]|
+              7[07]|
               [89]\d
             )\d
-          )\d{3}|
+          )\d{3}
         </nationalNumberPattern>
         <exampleNumber>3181234</exampleNumber>
       </mobile>
@@ -3079,34 +3058,24 @@
         </nationalNumberPattern>
         <exampleNumber>1123456789</exampleNumber>
       </fixedLine>
-      <!-- Also includes the new 11-digit mobile numbers that are being rolled out since 2012,
-           which are added at the end. -->
       <mobile>
-        <nationalNumberPattern>
-          1(?:
-            1(?:
-              5[347]|
-              [6-9]\d|
-            )|
-            [2-9][6-9]\d
-          )\d{6}|
+        <!-- Since 2012, Brazil has been migrating from 10 to 11 digits by inserting a 9 before the
+             last 8 digits. The following pattern is divided into 3 sections: ranges for which the
+             migration has been completed, ranges which are in transition, and ranges which are
+             still in the old format. (Ranges which were supposed to have been deprecated in
+             Oct. 2013 are still working as of Jan. 2014.) -->
+        <nationalNumberPattern>
+          1[1-9]9\d{8}|
+          2[12478]9?[6-9]\d{7}|
           (?:
-            2[12478]|
             3[1-578]|
             [4689][1-9]|
             5[13-5]|
             7[13-579]
-          )[6-9]\d{7}|
-          (?:
-            1(?:
-              19\d|
-              [2-9]9[6-9]
-            )|
-            2[12478]9[6-9]
-          )\d{7}
+          )[6-9]\d{7}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10,11}</possibleNumberPattern>
-        <exampleNumber>1161234567</exampleNumber>
+        <exampleNumber>11961234567</exampleNumber>
       </mobile>
       <tollFree>
         <nationalNumberPattern>800\d{6,7}</nationalNumberPattern>
@@ -3192,6 +3161,7 @@
           242300\d{4}|
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -3362,9 +3332,93 @@
                nationalPrefix="8" mobileNumberPortableRegion="true">
       <availableFormats>
         <numberFormat nationalPrefixFormattingRule="$NP 0$FG"
-          pattern="([1-4]\d)(\d{3})(\d{4})">
-          <leadingDigits>[1-4]</leadingDigits>
-          <format>$1 $2 $3</format>
+          pattern="(\d{2})(\d{3})(\d{2})(\d{2})">
+          <leadingDigits>
+            17[0-3589]|
+            2[4-9]|
+            [34]
+          </leadingDigits>
+          <leadingDigits>
+            17(?:
+              [02358]|
+              1[0-2]|
+              9[0189]
+            )|
+            2[4-9]|
+            [34]
+          </leadingDigits>
+          <format>$1 $2-$3-$4</format>
+        </numberFormat>
+        <numberFormat nationalPrefixFormattingRule="$NP 0$FG"
+          pattern="(\d{3})(\d{2})(\d{2})(\d{2})">
+          <leadingDigits>
+            1(?:
+              5[24]|
+              6[235]|
+              7[467]
+            )|
+            2(?:
+              1[246]|
+              2[25]|
+              3[26]
+            )
+          </leadingDigits>
+          <leadingDigits>
+            1(?:
+              5[24]|
+              6(?:
+                2|
+                3[04-9]|
+                5[0346-9]
+              )|
+              7(?:
+                [46]|
+                7[37-9]
+              )
+            )|
+            2(?:
+              1[246]|
+              2[25]|
+              3[26]
+            )
+          </leadingDigits>
+          <format>$1 $2-$3-$4</format>
+        </numberFormat>
+        <numberFormat nationalPrefixFormattingRule="$NP 0$FG"
+          pattern="(\d{4})(\d{2})(\d{3})">
+          <leadingDigits>
+            1(?:
+              5[169]|
+              6[3-5]|
+              7[179]
+            )|
+            2(?:
+              1[35]|
+              2[34]|
+              3[3-5]
+            )
+          </leadingDigits>
+          <leadingDigits>
+            1(?:
+              5[169]|
+              6(?:
+                3[1-3]|
+                4|
+                5[125]
+              )|
+              7(?:
+                1[3-9]|
+                7[0-24-6]|
+                9[2-7]
+              )
+            )|
+            2(?:
+              1[35]|
+              2[34]|
+              3[3-5]
+            )
+          </leadingDigits>
+          <format>$1 $2-$3</format>
         </numberFormat>
         <numberFormat nationalPrefixFormattingRule="$NP $FG"
           pattern="([89]\d{2})(\d{3})(\d{4})">
@@ -3392,8 +3446,8 @@
       <noInternationalDialling>
         <nationalNumberPattern>
           8(?:
-            [01]|
-            20
+            [013]|
+            [12]0
           )\d{8}|
           902\d{7}
         </nationalNumberPattern>
@@ -3406,7 +3460,7 @@
             1(?:
               5(?:
                 1[1-5]|
-                2\d|
+                [24]\d|
                 6[2-4]|
                 9[1-7]
               )|
@@ -3427,10 +3481,10 @@
                 4[0-8]
               )|
               3(?:
-                2\d|
+                [26]\d|
                 3[02-79]|
                 4[024-7]|
-                5[0-7]
+                5[03-7]
               )
             )
           )\d{5}
@@ -3634,6 +3688,8 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
+            55|
             66|
             77|
             88
@@ -3948,7 +4004,7 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[02-6]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>[02-7]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -3973,13 +4029,17 @@
       </fixedLine>
       <mobile>
         <!-- Added the prefixes 4[0-2] (Moov), 5[5-9] & 6[15] because SMS messages have been
-             successfully delivered. Supported by numbers found on the internet. -->
-        <nationalNumberPattern>
+             successfully delivered. Supported by numbers found on the internet. The prefix 56 was
+             assigned to MTN in July 2013:
+             http://www.atci.ci/images/stories/pdf/decisions-dg/decision_002.pdf
+             50 has been removed since Warid seems to have stopped operation in Côte d'Ivoire. -->
+          <nationalNumberPattern>
           (?:
             0[1-9]|
             4[0-24-9]|
-            5[05-9]|
-            6[015679]
+            5[4-9]|
+            6[015-79]|
+            77
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>01234567</exampleNumber>
@@ -4235,10 +4295,11 @@
           <leadingDigits>[48]00</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <!-- 100xx and 95xxx(x) numbers. Without this rule, the numbers will be formatted
-             incorrectly by the AsYouTypeFormatter because they overlap with area codes 010, 095x.
-             Note although ITU says the format is more like 95 xxx, in reality no space is used
-             when writing such numbers in China -->
+        <!-- 100xx and 95xxx(x) short numbers without area codes. Without this rule, these short
+             numbers will be formatted incorrectly by the AsYouTypeFormatter because they overlap
+             with area codes 010, 095x. These numbers are defined in ShortNumberMetadata.xml but
+             must be accounted for here. 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,6})">
           <leadingDigits>
             100|
@@ -4247,7 +4308,8 @@
           <format>$1</format>
           <intlFormat>NA</intlFormat>
         </numberFormat>
-        <!-- 100xx and 95xxx(x) numbers with area codes. -->
+        <!-- 100xx and 95xxx(x) numbers with area codes (these numbers without an area code are now
+             dealt with by ShortNumberMetadata.xml). -->
         <numberFormat nationalPrefixFormattingRule="$NP$FG" pattern="(\d{2})(\d{5,6})"
                       carrierCodeFormattingRule="$CC $FG">
           <leadingDigits>
@@ -4436,33 +4498,22 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          1(?:
-            00\d{2}|
-            \d{6,11}
-          )|
-          [2-7]\d{6,11}|
+          [1-7]\d{6,11}|
           8[0-357-9]\d{6,9}|
-          9(?:
-            5\d{3,4}|
-            \d{9}
-          )
+          9\d{9}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{4,12}</possibleNumberPattern>
       </generalDesc>
       <noInternationalDialling>
-        <!-- 100xx and 95xxx(x) numbers have been verified to be unreachable from overseas by
-             placing actual calls. -->
         <nationalNumberPattern>
-          100\d{2}|
           (?:
             4|
             (?:
               10
             )?8
-          )00\d{7}|
-          95\d{3,4}
+          )00\d{7}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{5,12}</possibleNumberPattern>
+        <possibleNumberPattern>\d{10,12}</possibleNumberPattern>
         <exampleNumber>4001234567</exampleNumber>
       </noInternationalDialling>
       <fixedLine>
@@ -4589,9 +4640,9 @@
       <mobile>
         <nationalNumberPattern>
           1(?:
-            3\d|
+            [38]\d|
             4[57]|
-            [58][0-35-9]
+            5[0-35-9]
           )\d{8}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{11}</possibleNumberPattern>
@@ -4616,36 +4667,18 @@
         <exampleNumber>16812345</exampleNumber>
       </premiumRate>
       <sharedCost>
-        <!-- 95xxx(x) numbers are covered by the ITU doc, but the following doc contains more info:
-             http://baike.baidu.com/view/3269670.htm. They can be dialed nationwide and are always
-             routed to the local provider. Note they can also be used with area codes when one
-             specifically wants to reach an operator in a different region. That case is more
-             like fixed-line numbers and is covered under the fixed-line pattern. -->
-        <nationalNumberPattern>
-          400\d{7}|
-          95\d{3,4}
-        </nationalNumberPattern>
-        <possibleNumberPattern>\d{5,10}</possibleNumberPattern>
+        <nationalNumberPattern>400\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>4001234567</exampleNumber>
       </sharedCost>
-      <uan>
-        <!-- 100xx numbers are mainly used for carrier services. They can be dialed nationwide and
-             are always routed to the local provider. They are free if called from a phone by the
-             same carrier, or charged at local rate if called from a phone by a different carrier.
-             Note they can also be used with area codes when one specifically wants to reach an
-             operator in a different region. That case is more like fixed-line numbers and is
-             covered under the fixed-line pattern.
-          -->
-        <nationalNumberPattern>100\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{5}</possibleNumberPattern>
-        <exampleNumber>10000</exampleNumber>
-      </uan>
     </territory>
 
     <!-- Colombia -->
     <!-- http://www.itu.int/oth/T020200002C/en -->
     <!-- http://en.wikipedia.org/wiki/Telephone_numbers_in_Colombia -->
-    <territory id="CO" countryCode="57" internationalPrefix="00[579]|#555|#999"
+    <!-- Extra international dialling prefixes from www.claro.com.co and www.tigo.com.co. -->
+    <!-- 05 and 005 are for Orbitel: co.orbitel.com -->
+    <territory id="CO" countryCode="57" internationalPrefix="00(?:4(?:[14]4|56)|[579])"
                nationalPrefix="0" nationalPrefixForParsing="0([3579]|4(?:44|56))?"
                mobileNumberPortableRegion="true">
       <availableFormats>
@@ -4711,12 +4744,11 @@
         <exampleNumber>12345678</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Virgin Mobile Colombia have reported that they are now using the 319 prefix. -->
         <nationalNumberPattern>
           3(?:
-            0[0-24]|
+            0[0-5]|
             1\d|
-            2[01]
+            [25][01]
           )\d{7}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
@@ -4742,7 +4774,7 @@
     <!-- Costa Rica -->
     <!-- http://www.itu.int/oth/T0202000030/en -->
     <territory id="CR" countryCode="506" internationalPrefix="00"
-               nationalPrefixForParsing="(19(?:0[0-2468]|19|20|66|77))"
+               nationalPrefixForParsing="(19(?:0[01468]|19|20|66|77))"
                carrierCodeFormattingRule="$CC $FG">
       <availableFormats>
         <numberFormat pattern="(\d{4})(\d{4})">
@@ -4772,7 +4804,11 @@
             0[0-4]|
             7[01]
           )\d{5}|
-          [67][0-2]\d{6}|
+          6(?:
+            [0-2]\d|
+            30
+          )\d{5}|
+          7[0-2]\d{6}|
           8[3-9]\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
@@ -4797,10 +4833,7 @@
             0(?:
               [04]0\d{4}|
               10[0-3]\d{3}|
-              2(?:
-                00\d|
-                900
-              )\d{2}|
+              2900\d{2}|
               3[01]\d{4}|
               5\d{5}|
               70[01]\d{3}|
@@ -4928,10 +4961,11 @@
             [48]\d{2}|
             50\d|
             7(?:
-              2[0-2]|
+              2[0-24]|
               [34]\d|
               6[35-7]|
-              77
+              77|
+              8[7-9]
             )
           )\d{4}
         </nationalNumberPattern>
@@ -4945,7 +4979,7 @@
               3[01]
             )|
             6(?:
-              [1679]\d|
+              [16-9]\d|
               3[01]
             )
           )\d{4}
@@ -5626,6 +5660,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -5728,6 +5763,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -5884,8 +5920,8 @@
         <nationalNumberPattern>
           9(?:
             39|
-            [4-6][89]|
-            7[7-9]|
+            [45][89]|
+            [67][7-9]|
             [89]\d
           )\d{6}
         </nationalNumberPattern>
@@ -6086,10 +6122,7 @@
          </numberFormat>
          <numberFormat pattern="(\d{2})(\d{6,7})">
            <leadingDigits>
-             1(?:
-               3|
-               5[23]
-             )|
+             1[35]|
              [4-6]|
              [89][2-9]
            </leadingDigits>
@@ -6108,7 +6141,7 @@
       <fixedLine>
         <!-- Short numbers used for businesses (starting with 16 or 19) are covered here. Note also
              that the plan says numbers starting with 15 should be followed by seven digit
-             subscriber numbers, but all numbers we have found online are in fact six digit.
+             subscriber numbers, but some numbers we have found online are in fact six digit.
              Subscriber numbers starting with 5 are also permitted for the area codes 040, with 5, 6
              and 7 for the area code 050, with 5 and 7 for 082, with 6 for 084, with 7 for 086 and
              092 and with 5 and 6 for 96. -->
@@ -6116,7 +6149,10 @@
           (?:
             1(
               3[23]\d|
-              5[23]
+              5(?:
+                [23]|
+                9\d
+              )
             )|
             2[2-4]\d{2}|
             3\d{2}|
@@ -6195,15 +6231,12 @@
       <!-- 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-578], 62[01457-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-8]|
-            [124-7]\d|
-            3[03-8]|
+            [12-7]\d|
             8[01]|
-            99
+            9[27-9]
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>650123456</exampleNumber>
@@ -6519,8 +6552,8 @@
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{4,10})">
           <leadingDigits>
-            2[09]|
             [14]|
+            2[09]|
             50|
             7[135]
           </leadingDigits>
@@ -6666,12 +6699,12 @@
         <exampleNumber>3212345</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Adding 7[67], 8[367], and 9[034678] from numbers found online and numbers where SMSs
+        <!-- Adding 7[5-8], 8[0367], and 9[034678] from numbers found online and numbers where SMSs
              have been received from. Adding 9[15] and 84 from Vodafone Fiji IR21. -->
         <nationalNumberPattern>
           (?:
-            7[0-467]|
-            8[3467]|
+            7[0-8]|
+            8[03467]|
             9\d
           )\d{5}
         </nationalNumberPattern>
@@ -7533,6 +7566,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -7888,8 +7922,15 @@
     </territory>
 
     <!-- Gibraltar -->
+    <!-- http://www.gra.gi/index.php?topic=numbering+plan&section=legislation&site=communications -->
     <territory id="GI" countryCode="350" internationalPrefix="00">
-      <!-- No formatting rules - numbers are always formatted as a block. -->
+      <availableFormats>
+        <!-- Most numbers are formatted as a block -->
+        <numberFormat pattern="(\d{3})(\d{5})">
+          <leadingDigits>2</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
+      </availableFormats>
       <generalDesc>
         <nationalNumberPattern>[2568]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
@@ -7898,8 +7939,14 @@
         <nationalNumberPattern>
           2(?:
             00\d|
-            16[0-7]|
-            22[2457]
+            1(?:
+              6[24-7]|
+              9\d
+            )|
+            2(?:
+              00|
+              2[2457]
+            )
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>20012345</exampleNumber>
@@ -7907,8 +7954,8 @@
       <mobile>
         <nationalNumberPattern>
           (?:
-            5[4-8]|
-            60
+            5[46-8]|
+            62
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>57123456</exampleNumber>
@@ -8008,7 +8055,7 @@
       <mobile>
         <nationalNumberPattern>
           (?:
-            2[0-2]|
+            2[0-6]|
             [3679]\d
           )\d{5}
         </nationalNumberPattern>
@@ -8049,15 +8096,9 @@
         <exampleNumber>30241234</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Limited to the new 9-digit mobile ranges, which came into effect March 29th 2013. -->
-        <nationalNumberPattern>
-          6(?:
-            [03]1|
-            2[128]|
-            5[57]|
-            6[2469]
-          )\d{6}
-        </nationalNumberPattern>
+        <!-- Prefixes here match those assigned to carriers, as per the ITU communication Jan 23rd
+             2013. -->
+        <nationalNumberPattern>6[02356]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>601123456</exampleNumber>
       </mobile>
@@ -8201,20 +8242,21 @@
           2(?:
             1\d{2}|
             2(?:
+              2[1-46-9]|
               3[1-8]|
               4[1-7]|
               5[1-4]|
               6[1-8]|
               7[1-5]|
-              [289][1-9]
+              [89][1-9]
             )|
             3(?:
               1\d|
               2[1-57]|
-              3[1-4]|
-              [45][1-3]|
+              [35][1-3]|
+              4[13]|
               7[1-7]|
-              8[1-6]|
+              8[124-6]|
               9[1-79]
             )|
             4(?:
@@ -8227,13 +8269,14 @@
             )|
             5(?:
               1\d|
-              [239][1-4]|
+              [29][1-4]|
+              3[1-5]|
               4[124]|
               5[1-6]
             )|
             6(?:
               1\d|
-              3[124]|
+              3[1245]|
               4[1-7]|
               5[13-9]|
               [269][1-6]|
@@ -8246,14 +8289,14 @@
               3[1-6]|
               4[1-7]|
               5[1-57]|
-              6[134]|
-              9[15-7]
+              6[135]|
+              9[125-7]
             )|
             8(?:
               1\d|
               2[1-5]|
               [34][1-4]|
-              9[1-7]
+              9[1-57]
             )
           )\d{6}
         </nationalNumberPattern>
@@ -8448,6 +8491,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -8678,7 +8722,7 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Extra prefixes 227[01389], 228X and 2292 were added from numbers found online. -->
+        <!-- Extra prefixes 227[01389], 228X, 2292 & 260X were added from numbers found online. -->
         <nationalNumberPattern>
           2(?:
             2(?:
@@ -8704,8 +8748,8 @@
               74
             )|
             6(?:
+              [056]\d|
               4[0-378]|
-              [56]\d|
               [78][0-8]|
               9[01]
             )|
@@ -9626,7 +9670,6 @@
     </territory>
 
     <!-- India -->
-    <!-- http://www.dot.gov.in/numbering_plan/numberplanindex.htm -->
     <!-- http://www.itu.int/oth/T0202000063/en -->
     <!-- http://en.wikipedia.org/wiki/%2B91 -->
     <!-- http://www.coai.in/msccodes.php -->
@@ -9644,9 +9687,8 @@
                2[0579]|
                3[057-9]|
                4[0-389]|
-               5[024-9]|
                6[0-35-9]|
-               7|
+               [57]|
                8[0-79]
              )|
              8(?:
@@ -9655,7 +9697,7 @@
                2[2356-9]|
                3[0-57-9]|
                [45]|
-               6[0245789]|
+               6[02457-9]|
                7[1-69]|
                8[0124-9]|
                9[02-9]
@@ -9684,21 +9726,19 @@
                  8[389]
                )|
                5(?:
-                 0|
-                 [47]9|
-                 [25]0|
-                 6[6-9]|
-                 [89][7-9]
+                 [034678]|
+                 2[03-9]|
+                 5[017-9]|
+                 9[7-9]
                )|
                6(?:
                  0[027]|
-                 12|
-                 20|
+                 1[0-257-9]|
+                 2[0-4]|
                  3[19]|
-                 5[45]|
-                 6[5-9]|
-                 7[679]|
-                 9[1-46-9]
+                 5[4589]|
+                 [679]|
+                 8[0-589]
                )|
                7(?:
                  0[2-9]|
@@ -9865,8 +9905,8 @@
          <numberFormat pattern="(\d{4})(\d{3})(\d{3})">
            <leadingDigits>
              1(?:
-               [2-579]|
-               [68][1-9]
+               [23579]|
+               [468][1-9]
              )|
              [2-8]
            </leadingDigits>
@@ -9890,6 +9930,11 @@
            <leadingDigits>18[06]0</leadingDigits>
            <format>$1 $2 $3</format>
          </numberFormat>
+         <numberFormat nationalPrefixFormattingRule="$FG"
+           pattern="(140)(\d{3})(\d{4})">
+           <leadingDigits>140</leadingDigits>
+           <format>$1 $2 $3</format>
+         </numberFormat>
          <!-- Televoting numbers. Formatting information is from
               http://www.bsnl.co.in/service/telev.htm -->
          <numberFormat nationalPrefixFormattingRule="$FG"
@@ -9925,7 +9970,7 @@
                 [12]\d{9}
               )
             )
-           )
+          )
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8,13}</possibleNumberPattern>
         <exampleNumber>1800123456</exampleNumber>
@@ -10120,8 +10165,8 @@
         <!-- 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: 8299, 8309.
-             New prefixes were added based on the document provided from mobile carriers:
+             land-line or mobile, since the ranges overlap. Extra prefixes added: 76[89]5, 8299,
+             8309. New prefixes were also added based on the document provided from mobile carriers:
              https://code.google.com/p/libphonenumber/issues/detail?id=260 -->
         <nationalNumberPattern>
           (?:
@@ -10146,21 +10191,19 @@
                 8[389]
               )|
               5(?:
-                0\d|
-                [47]9|
-                [25]0|
-                6[6-9]|
-                [89][7-9]
+                [034678]\d|
+                2[03-9]|
+                5[017-9]|
+                9[7-9]
               )|
               6(?:
                 0[027]|
-                12|
-                20|
+                1[0-257-9]|
+                2[0-4]|
                 3[19]|
-                5[45]|
-                6[5-9]|
-                7[679]|
-                9[1-46-9]
+                5[4589]|
+                [679]\d|
+                8[0-589]
               )|
               7(?:
                 0[2-9]|
@@ -10234,10 +10277,19 @@
         <possibleNumberPattern>\d{13}</possibleNumberPattern>
         <exampleNumber>1861123456789</exampleNumber>
       </premiumRate>
-      <uan>
+      <sharedCost>
+        <!-- While described as "universal numbers" in the numbering plan, evidence suggests
+             that 1860 number are best described as shared cost. See "Call Local Service" in:
+             http://www.tatadocomo.com/corporates/toll-free.aspx -->
         <nationalNumberPattern>1860\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{11}</possibleNumberPattern>
         <exampleNumber>18603451234</exampleNumber>
+      </sharedCost>
+      <uan>
+        <!-- Telemarketing numbers: http://en.wikipedia.org/wiki/Telephone_numbers_in_India -->
+        <nationalNumberPattern>140\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <exampleNumber>1409305260</exampleNumber>
       </uan>
     </territory>
 
@@ -10559,7 +10611,7 @@
       <mobile>
         <!-- TETRA = TErrestrial Trunked RAdio is included under mobile. -->
         <nationalNumberPattern>
-          38[59]\d{6}|
+          38[589]\d{6}|
           (?:
             6(?:
               1[0-8]|
@@ -10584,6 +10636,9 @@
         <exampleNumber>6101234</exampleNumber>
       </mobile>
       <tollFree>
+        <!-- The UIFN numbers mentioned in the Excel document are not yet included since no real
+             numbers can be found online, and it is not clear what these are; the standard
+             definition would have them under the +800 country code instead of Iceland. -->
         <nationalNumberPattern>800\d{4}</nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>8001234</exampleNumber>
@@ -10600,7 +10655,6 @@
       </voip>
       <voicemail>
         <nationalNumberPattern>
-          388\d{6}|
           (?:
             6(?:
               2[0-8]|
@@ -10616,7 +10670,8 @@
             95[48]
           )\d{4}
         </nationalNumberPattern>
-        <exampleNumber>388123456</exampleNumber>
+        <possibleNumberPattern>\d{7}</possibleNumberPattern>
+        <exampleNumber>6201234</exampleNumber>
       </voicemail>
     </territory>
 
@@ -11115,6 +11170,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -11185,7 +11241,8 @@
                 3[0-57-8]|
                 4[24-7]|
                 5[0-24-8]|
-                [6-9][02]
+                [6-8][02]|
+                9[0-2]
               )|
               7(?:
                 0[1-79]|
@@ -11201,11 +11258,13 @@
               1[1-35-7]|
               2[024-7]|
               3\d|
-              [457][02]|
+              4[0-2]|
+              [57][02]|
               60
             )|
             53(?:
-              [013][02]|
+              0[0-2]|
+              [13][02]|
               2[0-59]|
               49|
               5[0-35-9]|
@@ -11254,8 +11313,8 @@
           7(?:
             55|
             7[25-9]|
-            8[5-9]|
-            9[05-9]
+            8[05-9]|
+            9[015-9]
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -12571,36 +12630,42 @@
     <!-- Kiribati -->
     <!-- http://www.itu.int/oth/T0202000071/en -->
     <!-- We include the national prefix for parsing here just in case numbers can be dialled with a
-         leading 0 - the main ITU document says this is not the case and no numbers online have been
-         found formatted this way, but Kiribati's own document lists it as a national dialling
-         prefix. -->
+         leading 0 - no numbers online have been found formatted this way, but the ITU document
+         lists it as a national dialling prefix. -->
     <territory id="KI" countryCode="686" internationalPrefix="00"
                nationalPrefixForParsing="0">
       <!-- Numbers should be formatted as a block." -->
       <generalDesc>
-        <nationalNumberPattern>[2-689]\d{4}</nationalNumberPattern>
-        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+        <nationalNumberPattern>
+          [2-58]\d{4}|
+          7\d{7}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{5,8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
         <nationalNumberPattern>
           (?:
-            [234]\d|
+            [24]\d|
+            3[1-9]|
             50|
-            8[1-5]
+            8[0-5]
           )\d{3}
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
         <exampleNumber>31234</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Exclude 99[2349] from mobile since these are emergency numbers. -->
+        <!-- North Tarawa is listed as 720XXXXX-729XXXXX but considering that this deviates from the
+             pattern followed by every other place, we are assuming 731XXXXX-732XXXXX for now. -->
         <nationalNumberPattern>
-          6\d{4}|
-          9(?:
-            [0-8]\d|
-            9[015-8]
-          )\d{2}
+          7(?:
+            [24]\d|
+            3[1-9]|
+            8[0-5]
+          )\d{5}
         </nationalNumberPattern>
-        <exampleNumber>61234</exampleNumber>
+        <possibleNumberPattern>\d{8}</possibleNumberPattern>
+        <exampleNumber>72012345</exampleNumber>
       </mobile>
     </territory>
 
@@ -12690,6 +12755,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -13040,7 +13106,7 @@
         <nationalNumberPattern>
           (?:
             5(?:
-              1[0-35]|
+              1[0-5]|
               [05]\d
             )|
             6(?:
@@ -13055,7 +13121,7 @@
               4[049]|
               6[069]|
               [79]\d|
-              88
+              8[08]
             )
           )\d{5}
         </nationalNumberPattern>
@@ -13142,6 +13208,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -13511,6 +13578,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -14297,15 +14365,13 @@
       </fixedLine>
       <!-- Also duplicated in Western Sahara, please ensure you update both. -->
       <mobile>
-        <!-- Prefixes 60[1-578], 62[01457-9], 63[04-8] and 68[01], 698 are from numbers found
-             online, bug-reports, and information provided directly by the carriers. -->
+        <!-- http://www.anrt.ma/sites/default/files/Blocs_de_numeros_par_operateur.pdf -->
         <nationalNumberPattern>
           6(?:
             0[0-8]|
-            [124-7]\d|
-            3[013-8]|
+            [12-7]\d|
             8[01]|
-            9[89]
+            9[27-9]
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>650123456</exampleNumber>
@@ -14661,14 +14727,9 @@
       <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|
-            90
-          )\d{6}
-        </nationalNumberPattern>
+        <nationalNumberPattern>3[2-49]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
-        <exampleNumber>301234567</exampleNumber>
+        <exampleNumber>321234567</exampleNumber>
       </mobile>
       <!-- Putting VSAT numbers here. -->
       <voip>
@@ -14771,9 +14832,11 @@
       <mobile>
         <nationalNumberPattern>
           7(?:
-            [0-25-8]\d|
-            33
-          )\d{5}</nationalNumberPattern>
+            [0-25-8]\d{2}|
+            32\d|
+            421
+          )\d{4}
+        </nationalNumberPattern>
         <exampleNumber>72345678</exampleNumber>
       </mobile>
       <tollFree>
@@ -14896,7 +14959,8 @@
         <numberFormat pattern="(9)(\d{3})(\d{4,5})">
           <leadingDigits>
             9(?:
-              [235-9]|
+              2[0-4]|
+              [35-9]|
               4[13789]
             )
           </leadingDigits>
@@ -14906,13 +14970,19 @@
           <leadingDigits>94[0245]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <!-- Following majority of numbers found online. -->
+        <numberFormat pattern="(9)(\d{3})(\d{3})(\d{3})">
+          <leadingDigits>925</leadingDigits>
+          <format>$1 $2 $3 $4</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
           [14578]\d{5,7}|
           [26]\d{5,8}|
           9(?:
-            [258]|
+            2\d{0,2}|
+            [58]|
             3\d|
             4\d{1,2}|
             [679]\d?
@@ -15002,7 +15072,10 @@
         <nationalNumberPattern>
           17[01]\d{4}|
           9(?:
-            2[0-4]|
+            2(?:
+              [0-4]|
+              5\d{2}
+            )|
             3[136]\d|
             4(?:
               0[0-4]\d|
@@ -15239,6 +15312,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -15381,6 +15455,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -15427,6 +15502,7 @@
           2(?:
             0(?:
               1[0-6]|
+              3[1-4]|
               [69]\d
             )|
             [1-357]\d{2}
@@ -15435,6 +15511,8 @@
         <exampleNumber>21001234</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- 7210 and 92XX come from the allocations listed on www.mca.org.mt, but they are not
+             listed in the latest ITU document. -->
         <nationalNumberPattern>
           (?:
             7(?:
@@ -15552,7 +15630,7 @@
             )|
             7\d{2}|
             8(?:
-              [26]\d|
+              [256]\d|
               7[15-8]
             )|
             9[0-8]\d
@@ -16009,7 +16087,8 @@
         <exampleNumber>123456789</exampleNumber>
       </mobile>
       <tollFree>
-        <nationalNumberPattern>1[38]00\d{6}</nationalNumberPattern>
+        <!-- http://www.skmm.gov.my/skmmgovmy/media/General/pdf/Special_Service_Number.pdf -->
+        <nationalNumberPattern>1[378]00\d{6}</nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>1300123456</exampleNumber>
       </tollFree>
@@ -16018,11 +16097,6 @@
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>1600123456</exampleNumber>
       </premiumRate>
-      <personalNumber>
-        <nationalNumberPattern>1700\d{6}</nationalNumberPattern>
-        <possibleNumberPattern>\d{10}</possibleNumberPattern>
-        <exampleNumber>1700123456</exampleNumber>
-      </personalNumber>
       <voip>
         <nationalNumberPattern>154\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
@@ -16117,8 +16191,8 @@
                 7\d?
               )|
               3(?:
-                2\d|
-                3[378]
+                [01378]|
+                2\d
               )|
               4[01]|
               69|
@@ -16126,7 +16200,6 @@
             )|
             2(?:
               17|
-              25|
               5(?:
                 [0-36-8]|
                 4\d?
@@ -16391,7 +16464,7 @@
           <leadingDigits>[129]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="([3-8]\d)(\d{3})(\d{2,3})">
+        <numberFormat pattern="(\d{2})(\d{3})(\d{2,3})">
           <leadingDigits>
             [3-6]|
             7(?:
@@ -16402,10 +16475,11 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="([78]\d{2})(\d{3})(\d{3,4})">
+        <numberFormat pattern="(\d{3})(\d{3})(\d{3,4})">
           <leadingDigits>
             70|
-            8[01]
+            8[01]|
+            909
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -16424,7 +16498,8 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          [1-69]\d{5,8}|
+          [1-6]\d{5,8}|
+          9\d{5,9}|
           [78]\d{5,13}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{5,14}</possibleNumberPattern>
@@ -16432,7 +16507,10 @@
       <fixedLine>
         <nationalNumberPattern>
           [12]\d{6,7}|
-          9\d{7}|
+          9(?:
+            0[3-9]|
+            [1-9]\d
+          )\d{5}|
           (?:
             3\d|
             4[023568]|
@@ -16460,7 +16538,7 @@
              from Etisalat, 814 MTN and 811 from Glo. Furthermore, the fixed-line prefixes owned by
              Starcomms have apparently, according to the company, been used for mobile numbers too,
              despite the ITU plan, so we list them here as well. 701 has been added for Airtel/Zain.
-             -->
+             9091 has been added for Etisalat. -->
         <nationalNumberPattern>
           (?:
             1(?:
@@ -16542,7 +16620,8 @@
             8(?:
               0[2-9]|
               1\d
-            )\d
+            )\d|
+            9091
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8,10}</possibleNumberPattern>
@@ -16570,7 +16649,7 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[1258]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>[12578]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -16579,9 +16658,14 @@
       </fixedLine>
       <mobile>
         <!-- Online users have reported seeing 5500 used by Claro; until we can find actual numbers
-             or any documentation about it, we restrict this pattern to this prefix exactly. -->
+             or any documentation about it, we restrict this pattern to this prefix exactly. 57 and
+             78 were added from bug reports/numbers found online. -->
         <nationalNumberPattern>
-          5500\d{4}|
+          5(?:
+            500\d{4}|
+            7\d{6}
+          )|
+          78\d{6}|
           8\d{7}
         </nationalNumberPattern>
         <exampleNumber>81234567</exampleNumber>
@@ -17168,7 +17252,7 @@
               65|
               7[016-8]|
               8[58]|
-              9[134]
+              9[1349]
             )|
             2(?:
               [0235679]\d|
@@ -17177,19 +17261,18 @@
               8[028]
             )|
             3(?:
-              0[0-7]|
+              [09]\d|
               1[14-7]|
               2[0-3]|
               3[03]|
               4[0457]|
               5[56]|
               6[068]|
-              7[078]|
-              80|
-              9\d
+              7[06-8]|
+              8[089]
             )|
             4(?:
-              3[013-59]|
+              3[013-69]|
               4\d|
               7[0-689]
             )|
@@ -17202,8 +17285,9 @@
             7(?:
               0[09]|
               2[0-267]|
-              [349]0|
-              5[6-9]|
+              3[06]|
+              [49]0|
+              5[06-9]|
               7[0-24-7]|
               8[89]
             )|
@@ -17213,10 +17297,10 @@
               8[02]
             )|
             9(?:
-              0[78]|
-              1[0178]|
-              2[0378]|
-              3[379]|
+              0[6-8]|
+              1[016-8]|
+              2[036-8]|
+              3[3679]|
               40|
               5[0489]|
               6[06-9]|
@@ -17242,10 +17326,9 @@
             )
           )\d{4}|
           6(?:
-            [04-9]\d|
+            [024-9]\d|
             1[0-5]|
-            2[0-7]|
-            3[5-9]
+            3[04-9]
           )\d{5}
         </nationalNumberPattern>
         <exampleNumber>60012345</exampleNumber>
@@ -17872,8 +17955,7 @@
             0\d|
             1[1-5]|
             2[0-5]|
-            3[1-6]|
-            4[1-7]|
+            [34][1-7]|
             55|
             64
           )\d{7}
@@ -18130,6 +18212,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -19618,7 +19701,7 @@
         <numberFormat pattern="([3-7]\d)(\d{3})(\d{3})">
           <leadingDigits>
             [37][01]|
-            4[019]|
+            4[0139]|
             51|
             6
           </leadingDigits>
@@ -19657,14 +19740,13 @@
         <exampleNumber>11234567</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- We include 049 here - it is VoIP in the plan, but SMS messages have been successfully
-             delivered - and it is run by Mobitel. There are also mobile numbers found on the
-             internet with this prefix - it is apparently used in Kosovo. Also
-             added 068, which is used by the mobile operator bob.si -->
+        <!-- We include 043 and 049 here - it is VoIP in the plan, but is actually used to provide
+             mobile coverage to Kosovo. Also added 068, which is used by the mobile operator bob.si
+         -->
         <nationalNumberPattern>
           (?:
             [37][01]|
-            4[019]|
+            4[0139]|
             51|
             6[48]
           )\d{6}
@@ -19964,29 +20046,37 @@
 
     <!-- Senegal -->
     <!-- http://www.itu.int/oth/T02020000B8/en -->
+    <!-- http://www.artpsenegal.net -->
     <territory id="SN" countryCode="221" internationalPrefix="00">
       <availableFormats>
         <!-- Using yellow pages and online telecom company formatting, rather than that implied in
              the national numbering plan. -->
         <numberFormat pattern="(\d{2})(\d{3})(\d{2})(\d{2})">
+          <leadingDigits>[37]</leadingDigits>
+          <format>$1 $2 $3 $4</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{2})(\d{2})(\d{2})">
+          <leadingDigits>8</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[37]\d{8}</nationalNumberPattern>
+        <nationalNumberPattern>[378]\d{8}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
         <nationalNumberPattern>
           3(?:
             0(?:
-              1[01]|
+              1[0-2]|
               80
             )|
+            211|
             3(?:
               8[1-9]|
               9[2-9]
-            )
+            )|
+            90[1-5]
           )\d{5}
         </nationalNumberPattern>
         <exampleNumber>301012345</exampleNumber>
@@ -19994,36 +20084,34 @@
       <mobile>
         <nationalNumberPattern>
           7(?:
-            0(?:
-              [01279]0|
-              3[03]|
-              4[05]|
-              5[06]|
-              6[03-5]|
-              8[029]
-            )|
-            6(?:
-              1[23]|
-              2[89]|
-              3[3489]|
-              4[6-9]|
-              5\d|
-              6[3-9]|
-              7[45]|
-              8[3-8]
-            )|
-            7\d{2}|
-            8(?:
-              01|
-              1[01]
-            )
-          )\d{5}
+            [07]\d|
+            21|
+            6[1-9]|
+            8[0-26]|
+            90
+          )\d{6}
         </nationalNumberPattern>
-        <exampleNumber>701012345</exampleNumber>
+        <exampleNumber>701234567</exampleNumber>
       </mobile>
+      <tollFree>
+        <nationalNumberPattern>800\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>800123456</exampleNumber>
+      </tollFree>
+      <premiumRate>
+        <!-- Revenu Partagé in the plan. -->
+        <nationalNumberPattern>88[4689]\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>884123456</exampleNumber>
+      </premiumRate>
+      <sharedCost>
+        <nationalNumberPattern>81[02468]\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>810123456</exampleNumber>
+      </sharedCost>
       <voip>
-        <nationalNumberPattern>33301\d{4}</nationalNumberPattern>
-        <exampleNumber>333011234</exampleNumber>
+        <nationalNumberPattern>391\d{6}</nationalNumberPattern>
+        <exampleNumber>391011234</exampleNumber>
       </voip>
     </territory>
 
@@ -20104,7 +20192,7 @@
             7\d{2}|
             9(?:
               07|
-              [19]
+              [13-9]
             )\d
           )\d{5}
         </nationalNumberPattern>
@@ -20151,12 +20239,14 @@
         <exampleNumber>211234</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Adding 74 from numbers found online. -->
         <nationalNumberPattern>
           (?:
-            7[1-57]|
-            8[1-9]
-          )\d{5}
+            7(?:
+              [1-357]\d|
+              4[0-5]
+            )|
+            8[1-9]\d
+          )\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>7412345</exampleNumber>
@@ -20310,6 +20400,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -20504,7 +20595,7 @@
               3[1-389]|
               4[1-7]
             )|
-            4[34][12]
+            4[34][1-3]
           )\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
@@ -20514,6 +20605,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -20933,8 +21025,9 @@
         <!-- According to feedback from users, the carrier Altyn Asyr is the only one currently
              operating, with the numbers 6[3-5]\d{6}. MTS used to operate the ranges 6[6-8] but this
              has been suspended. It is unclear whether it will resume. We support both ranges in the
-             meantime. -->
-        <nationalNumberPattern>6[3-8]\d{6}</nationalNumberPattern>
+             meantime. The range 62 seems also now to be in use, according to numbers found online.
+             -->
+        <nationalNumberPattern>6[2-8]\d{6}</nationalNumberPattern>
         <exampleNumber>66123456</exampleNumber>
       </mobile>
       <!-- No tollFree or premiumRate information can be found. -->
@@ -20942,6 +21035,9 @@
 
     <!-- Tunisia -->
     <!-- http://www.itu.int/oth/T02020000D5/en -->
+    <!-- http://www.tunisietelecom.tn/tt/wcm/connect/?MOD=PDMProxy&TYPE=personalization&ID=NONE&KEY=NONE&LIBRARY=%2FcontentRoot%2Ficm%3Alibraries%5B16%5D&FOLDER=%2F&DOC_NAME=%2FcontentRoot%2Ficm%3Alibraries%5B16%5D%2FOTTI+2011.pdf
+         http://www.tunisietelecom.tn/tt/internet/fr/pme/fixe/numeros_acceuil
+      -->
     <territory id="TN" countryCode="216" internationalPrefix="00">
       <availableFormats>
         <numberFormat pattern="(\d{2})(\d{3})(\d{3})">
@@ -20953,19 +21049,18 @@
         <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. -->
+        <!-- 3[012] numbers are no longer listed in the ITU doc, but we support them based on
+             online searches. -->
         <nationalNumberPattern>
-          (?:
-            3[012]|
-            7\d|
-            81
-          )\d{6}
+          3[012]\d{6}|
+          7\d{7}|
+          81200\d{3}
         </nationalNumberPattern>
         <exampleNumber>71234567</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- Numbers starting with 5 are no longer listed in the ITU doc, but we support them based
+             on online searches and Wikipedia. -->
         <nationalNumberPattern>
           (?:
             [259]\d|
@@ -20974,12 +21069,24 @@
         </nationalNumberPattern>
         <exampleNumber>20123456</exampleNumber>
       </mobile>
-      <!-- These are listed as 'value added services' - pending further information, we add them
-           here for now. -->
+      <tollFree>
+        <!-- ITU lists 80 xx xx xx, but the document published by Tunisie Telecom has more specific
+             information which is followed here. -->
+        <nationalNumberPattern>8010\d{4}</nationalNumberPattern>
+        <exampleNumber>80101234</exampleNumber>
+      </tollFree>
       <premiumRate>
-        <nationalNumberPattern>8[028]\d{6}</nationalNumberPattern>
-        <exampleNumber>80123456</exampleNumber>
+        <nationalNumberPattern>88\d{6}</nationalNumberPattern>
+        <exampleNumber>88123456</exampleNumber>
       </premiumRate>
+      <sharedCost>
+        <!-- 8110xxxx numbers are listed as being "discounted non-geographical numbers" and are put
+             here for now. In the future we might consider them as UAN.
+             ITU lists 82 xx xx xx, but the document published by Tunisie Telecom has more specific
+             information which is followed here. -->
+        <nationalNumberPattern>8[12]10\d{4}</nationalNumberPattern>
+        <exampleNumber>81101234</exampleNumber>
+      </sharedCost>
     </territory>
 
     <!-- Tonga -->
@@ -21181,11 +21288,12 @@
         <exampleNumber>8682211234</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Adding 48X & 70X from the IR21 published by TSTT. -->
+        <!-- Adding 48X & 70X from the IR21 published by TSTT. 288 seems to be used based on numbers
+             found online. -->
         <nationalNumberPattern>
           868(?:
             2(?:
-              8[59]|
+              8[5-9]|
               9\d
             )|
             3(?:
@@ -21212,6 +21320,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -21616,7 +21725,7 @@
             )|
             3[23]\d|
             5[0-4]\d|
-            60\d|
+            6[03]\d|
             8[0-2]\d
           )\d{4}|
           [34]\d{8}
@@ -21702,7 +21811,7 @@
               3[014679]|
               47|
               5[12]|
-              6[01]|
+              6[014]|
               8[056]
             )|
             4(?:
@@ -21741,7 +21850,7 @@
             7(?:
               0[1-46-8]|
               1[02-9]|
-              2[047]|
+              2[0457]|
               3[1247]|
               4[07]|
               5[47]|
@@ -21794,7 +21903,7 @@
               3[014679]|
               47|
               5[12]|
-              6[01]|
+              6[014]|
               8[056]
             )|
             4(?:
@@ -21833,7 +21942,7 @@
             7(?:
               0[1-46-8]|
               1[02-9]|
-              2[047]|
+              2[0457]|
               3[1247]|
               4[07]|
               5[47]|
@@ -21869,6 +21978,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -22375,6 +22485,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -22519,6 +22630,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|
@@ -22639,6 +22751,7 @@
         <nationalNumberPattern>
           8(?:
             00|
+            44|
             55|
             66|
             77|