countries: no continent class for unused organisations

Only use continent classification for reserved countries.
Distinguish 'not used' organisations by unremarkable 'invalid' class.

diff --git a/countries.plp b/countries.plp
index a97a17475279fbb01cc451ee5dc8d2c8b4aa0e0c..3019a292a1143fd6ba754c4795fa82678ddaa18b 100644 (file)
--- a/countries.plp
+++ b/countries.plp
@@ -64,6 +64,7 @@ my $cc = do 'countries.inc.pl';
        <td class="X c-na">north america
        <td class="Xr">reserved
        <td class="">free
        <td class="X c-na">north america
        <td class="Xr">reserved
        <td class="">free

+       <td class="X Xi">unused

        <td class="X Co">user-assigned
        </table>
 
        <td class="X Co">user-assigned
        </table>
 

diff --git a/tools/mkcountries-geonames b/tools/mkcountries-geonames
index fe1acb729e4215bea12d7a0d2ddf464912d421ea..b10bb83705bf8c2d3c3ce77314a44db65902be60 100755 (executable)
--- a/tools/mkcountries-geonames
+++ b/tools/mkcountries-geonames
@@ -38,16 +38,16 @@ my %cc;  # map of country code to info array
        yv => ["(Venezuela)", "c-sa Xr", undef, 've'],
 
        # WIPO, agreed not to use
        yv => ["(Venezuela)", "c-sa Xr", undef, 've'],
 
        # WIPO, agreed not to use

-       ap => ["African Regional Industrial Property Organization", "c-af Xr", "ARIPO"],
-       bx => ["Benelux Office for Intellectual Property", "c-eu Xr", "BOIP"],
-       ef => ["European Community Patent Convention", "c-eu Xr", "CPC"],
-       em => ["European Trademark Office", "c-eu Xr", "OHIM"],
-       ep => ["European Patent Organization", "c-eu Xr", "EPOrg"],
-       ev => ["Eurasian Patent Organization", "c-as Xr", "EAPO"],
-       gc => ["Gulf Patent Office", "c-as Xr", "GCCPO"],
-       ib => ["International Bureau of WIPO", "Xr", "IB WIPO"],
-       oa => ["African Intellectual Property Organization", "c-af Xr", "OAPI"],
-       wo => ["World Intellectual Property Organization", "Xr", "WIPO"],
+       ap => ["African Regional Industrial Property Organization", "Xi", "ARIPO"], # c-af
+       bx => ["Benelux Office for Intellectual Property", "Xi", "BOIP"], # c-eu
+       ef => ["European Community Patent Convention", "Xi", "CPC"], # c-eu
+       em => ["European Trademark Office", "Xi", "OHIM"], # c-eu
+       ep => ["European Patent Organization", "Xi", "EPOrg"], # c-eu
+       ev => ["Eurasian Patent Organization", "Xi", "EAPO"], # c-as
+       gc => ["Gulf Patent Office", "Xi", "GCCPO"], # c-as
+       ib => ["International Bureau of WIPO", "Xi", "IB WIPO"],
+       oa => ["African Intellectual Property Organization", "Xi", "OAPI"], # c-af
+       wo => ["World Intellectual Property Organization", "Xi", "WIPO"],

 );
 
 while (<>) {
 );
 
 while (<>) {