Update formatting rules to consider country instead of country-name

docs/model/AU.html

@@ -281,6 +281,15 @@
 
           <span>IT</span></a>
 
+        <a class="mdl-navigation__link "
+          href="JP.html">
+
+          <span class="mdl-color-text--blue-grey-400 material-icons"
+              style="font-family:'Roboto', 'Helvetica', sans-serif;">
+              🇯🇵</span>
+
+          <span>JP</span></a>
+
         <a class="mdl-navigation__link "
           href="MX.html">
 
@@ -758,11 +767,50 @@ <h2 class="mdl-card__title-text">Overview of concepts</h2>
 
 
 
+  </div>
+
+
+
+      <div class="concept-content">
+
+
+<div class="concept">
+  <div class="concept-id">
+
+
+    <a href="#postal-code-prefix">postal-code-prefix</a>
+    - Postal code prefix
+
+
+
+
+  </div>
+
+</div>
+
+
+
+<div class="concept">
+  <div class="concept-id">
+
+
+    <a href="#postal-code-suffix">postal-code-suffix</a>
+    - Postal code suffix
+
+
+
+
   </div>
 
 </div>
 
 
+      </div>
+
+
+</div>
+
+
 
 <div class="concept">
   <div class="concept-id">
@@ -1368,6 +1416,10 @@ <h2 class="mdl-card__title-text">Example addresses</h2>
 
 
 
+
+
+
+
 
 
 
@@ -1485,6 +1537,10 @@ <h2 class="mdl-card__title-text">Example addresses</h2>
 
 
 
+
+
+
+
         <tr>
           <td>country</td><td><pre style="margin:0">AU</pre></td>
         </tr>
@@ -1549,9 +1605,27 @@ <h2 class="mdl-card__title-text">Example addresses</h2>
       Output for "address":<br>
       <pre class="formatting_example_textbox">Apt. 19 Level 7  345 Main Street
 SYDNEY NSW 2000
-AUSTRALIA</pre>
+AU</pre>
 
 
+        <p class="formatting_errors">
+          Expected:
+          <pre class="formatting_example_textbox formatting_errors">Apt. 19 Level 7  345 Main Street
+SYDNEY NSW 2000
+AUSTRALIA
+</pre>
+        </p>
+        <p class="formatting_errors">
+          Delta:
+          <pre class="formatting_example_textbox formatting_errors">--- expected_output
++++ actual_output
+@@ -1,3 +1,3 @@
+ Apt. 19 Level 7  345 Main Street
+ SYDNEY NSW 2000
+-AUSTRALIA
++AU</pre>
+        </p>
+
 
   </td>
 </tr>
@@ -3544,13 +3618,13 @@ <h4>Children:</h4>
 <h4>Formatting:</h4>
 <div>
 <span class="formatting_token">address</span> =
-<span class="formatting_token">street-address-alternative-1</span><span class="formatting_token_separator">⏎</span><span class="formatting_token">locality1</span><span class="formatting_token_separator">␣</span><span class="formatting_token">admin-area1</span><span class="formatting_token_separator">␣</span><span class="formatting_token">postal-code</span><span class="formatting_token_separator">⏎</span><span class="formatting_token">country-name</span>
+<span class="formatting_token">street-address-alternative-1</span><span class="formatting_token_separator">⏎</span><span class="formatting_token">locality1</span><span class="formatting_token_separator">␣</span><span class="formatting_token">admin-area1</span><span class="formatting_token_separator">␣</span><span class="formatting_token">postal-code</span><span class="formatting_token_separator">⏎</span><span class="formatting_token">country</span>
 </div>
 
 <h5>Flattened formatting:</h5>
 <div>
 <span class="formatting_token">address</span> =<br>
-<span class="formatting_token">unit-type</span><span class="formatting_token">unit-name</span><span class="formatting_token_separator">␣</span><span class="formatting_token_prefix">Level </span><span class="formatting_token">floor</span><span class="formatting_token_separator">␣␣</span><span class="formatting_token">building</span><span class="formatting_token_separator">␣</span><span class="formatting_token">street</span><span class="formatting_token_separator"><br></span><span class="formatting_token">locality1</span><span class="formatting_token_separator">␣</span><span class="formatting_token">admin-area1</span><span class="formatting_token_separator">␣</span><span class="formatting_token">postal-code</span><span class="formatting_token_separator"><br></span><span class="formatting_token">country-name</span>
+<span class="formatting_token">unit-type</span><span class="formatting_token">unit-name</span><span class="formatting_token_separator">␣</span><span class="formatting_token_prefix">Level </span><span class="formatting_token">floor</span><span class="formatting_token_separator">␣␣</span><span class="formatting_token">building</span><span class="formatting_token_separator">␣</span><span class="formatting_token">street</span><span class="formatting_token_separator"><br></span><span class="formatting_token">locality1</span><span class="formatting_token_separator">␣</span><span class="formatting_token">admin-area1</span><span class="formatting_token_separator">␣</span><span class="formatting_token">postal-code-prefix</span><span class="formatting_token_separator">-</span><span class="formatting_token">postal-code-suffix</span><span class="formatting_token_separator"><br></span><span class="formatting_token">country</span>
 </div>
 
 </div><h3 id="street-address">
@@ -5505,6 +5579,261 @@ <h5>Flattened formatting:</h5>
 
 
 
+
+
+
+
+
+
+
+<h4>Parsing:</h4>
+<div class="parsing">
+
+
+
+
+<details>
+  <summary>Decomposition
+
+    (<code>ParsePostalCodeMandatorySeparatorExpression</code>)
+
+  </summary>
+  Anchor beginning: True<br>
+
+    Capture Reference: ParsePostalCodeMandatorySeparatorExpression<br>
+
+
+
+<details>
+  <summary>
+
+      Capture <code>postal-code</code>
+
+    (MATCH_REQUIRED)
+  </summary>
+
+
+      Parts: <br>
+      <ul>
+
+        <li>
+
+
+<details>
+  <summary>
+
+      Capture <code>postal-code-prefix</code>
+
+    (MATCH_REQUIRED)
+  </summary>
+
+
+      Parts: <br>
+      <ul>
+
+        <li>
+
+
+
+<details>
+  <summary>Regex Reference: <code>kZipPrefixValueRe</code></summary>
+
+
+
+
+  Regex Reference: <code>kAlphaNumericSequenceRe</code> =&gt;
+  <code class="parsing-regexfragment">(?:[^\W_]+)</code>
+
+
+
+
+</details>
+
+
+
+</li>
+
+      </ul>
+
+
+
+</details>
+
+
+</li>
+
+        <li>
+
+
+
+Separator: Regex Reference <code>kZipCodeSeparatorsRe</code> =&gt;
+  <code class="parsing-regexfragment">(?:[\s-]+)</code>
+
+
+
+</li>
+
+        <li>
+
+
+<details>
+  <summary>
+
+      Capture <code>postal-code-suffix</code>
+
+    (MATCH_OPTIONAL)
+  </summary>
+
+
+      Parts: <br>
+      <ul>
+
+        <li>
+
+
+
+<details>
+  <summary>Regex Reference: <code>kZipSuffixValueRe</code></summary>
+
+
+
+
+  Regex Reference: <code>kAlphaNumericSequenceRe</code> =&gt;
+  <code class="parsing-regexfragment">(?:[^\W_]+)</code>
+
+
+
+
+</details>
+
+
+
+</li>
+
+      </ul>
+
+
+
+</details>
+
+
+</li>
+
+      </ul>
+
+
+
+</details>
+
+
+
+
+  Anchor end: True<br>
+</details>
+
+
+
+
+</div>
+
+<div>
+<h4>Children:</h4>
+<ul>
+
+  <li>
+
+    <a href="#postal-code-prefix">postal-code-prefix</a>
+  </li>
+
+  <li>
+
+    <a href="#postal-code-suffix">postal-code-suffix</a>
+  </li>
+
+</ul>
+</div>
+
+
+
+
+
+
+
+<h4>Formatting:</h4>
+<div>
+<span class="formatting_token">postal-code</span> =
+<span class="formatting_token">postal-code-prefix</span><span class="formatting_token_separator">-</span><span class="formatting_token">postal-code-suffix</span>
+</div>
+
+<h5>Flattened formatting:</h5>
+<div>
+<span class="formatting_token">postal-code</span> =<br>
+<span class="formatting_token">postal-code-prefix</span><span class="formatting_token_separator">-</span><span class="formatting_token">postal-code-suffix</span>
+</div>
+
+</div><h3 id="postal-code-prefix">
+  <a href="#postal-code-prefix">#</a>
+
+  postal-code-prefix
+</h3>
+<div style="margin-left: 20px;">
+
+Postal code prefix
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</div><h3 id="postal-code-suffix">
+  <a href="#postal-code-suffix">#</a>
+
+  postal-code-suffix
+</h3>
+<div style="margin-left: 20px;">
+
+Postal code suffix
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+