- Fix specification about language specification

- Modify definitions about region specifier

diff --git a/char-atr.ja.txt b/char-atr.ja.txt
index be8c60f..9811338 100644 (file)
--- a/char-atr.ja.txt
+++ b/char-atr.ja.txt
@@ -1,4 +1,4 @@
-CHISE \e$BJ8;zAG@-0lMwI=\e(B     \e$BBh\e(B0.2\e$BHG\e(B
+CHISE \e$BJ8;zAG@-0lMwI=\e(B     \e$BBh\e(B0.3\e$BHG\e(B
 
 * \e$BAG@-L>$N7A<0\e(B
 
@@ -24,9 +24,17 @@ CHISE \e$BJ8;zAG@-0lMwI=\e(B   \e$BBh\e(B0.2\e$BHG\e(B
 
        <16\e$B?JHV9f\e(B> := 0x[0-9A-F]+
 
-       <\e$BCO0h;XDj;R\e(B> := [A-Z]+
+       <\e$BCO0h;XDj;R\e(B> := <2-letter country codes> | [A-Z]+
 
-       <\e$B8@8l;XDj;R\e(B> := [A-Z][a-z]+
+       <2-letter country codes> := [A-Z][A-Z] ; ISO 3166 2 letter codes
+
+       <\e$B8@8l;XDj;R\e(B> := {<2-letter language codes> |
+                        <3-letter language codes> |
+                        [A-Z][a-z]+}(-[a-z]+)
+
+       <2-letter codes> := [a-z][a-z] ; ISO 639 2 letter codes
+
+       <3-letter codes> := [a-z][a-z][a-z] ; ISO 639 3 letter codes
 
        <\e$BG/;XDj;R\e(B> := [0-9]+ | -[0-9]+
 
@@ -42,7 +50,7 @@ CN    \e$BCf9q!"Cf2Z?ML16&OB9q\e(B
 
 ** \e$B8@8l;XDj;R\e(B
 
-JA (ja)        \e$BF|K\8l\e(B
+ja     \e$BF|K\8l\e(B
 
 
 ** \e$BMQ;z7O;XDj;R\e(B