diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-08-24 21:53:31 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-08-24 21:53:31 +0200 |
| commit | 4119309d70c7fc32637e77f2e84c185ad1768892 (patch) | |
| tree | fd529095f9005b572d6f7ca1c15b98620f443120 | |
| parent | 4f57eefe1e84b5a90e08474092ea6fc8825ad5c9 (diff) | |
| download | vim-git-8.1.1923.tar.gz | |
patch 8.1.1923: some source files are not in a normal encodingv8.1.1923
Problem: Some source files are not in a normal encoding.
Solution: Convert hangulin.c from euc-kr to utf-8 and digraph.c from latin1
to utf-8. (Daniel Hahler, closes #4731)
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | src/digraph.c | 790 | ||||
| -rw-r--r-- | src/hangulin.c | 204 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 500 insertions, 498 deletions
diff --git a/.travis.yml b/.travis.yml index 085d3c5b3..9c184f388 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,7 +96,7 @@ anchors: - do_test() { "$@"; } coverage: &coverage - - ~/.local/bin/coveralls -b "${SRCDIR}" -x .xs -e "${SRCDIR}"/if_perl.c -e "${SRCDIR}"/xxd -e "${SRCDIR}"/libvterm --encodings utf-8 latin-1 EUC-KR + - ~/.local/bin/coveralls -b "${SRCDIR}" -x .xs -e "${SRCDIR}"/if_perl.c -e "${SRCDIR}"/xxd -e "${SRCDIR}"/libvterm --encodings utf-8 - (cd "${SRCDIR}" && bash <(curl -s https://codecov.io/bash)) asan_symbolize: &asan_symbolize diff --git a/src/digraph.c b/src/digraph.c index 8a3bf12b3..758c23d36 100644 --- a/src/digraph.c +++ b/src/digraph.c @@ -40,62 +40,62 @@ static digr_T digraphdefault[] = * ATARI digraphs */ {{'C', ',', 128}, /* ~@ XX */ - {'u', '"', 129}, /* */ - {'e', '\'', 130}, /* */ - {'a', '^', 131}, /* */ - {'a', '"', 132}, /* */ - {'a', '`', 133}, /* */ - {'a', '@', 134}, /* */ + {'u', '"', 129}, /* */ + {'e', '\'', 130}, /* */ + {'a', '^', 131}, /* */ + {'a', '"', 132}, /* */ + {'a', '`', 133}, /*
*/ + {'a', '@', 134}, /* */ {'c', ',', 135}, /* ~G XX */ {'e', '^', 136}, /* ~H XX */ - {'e', '"', 137}, /* */ - {'e', '`', 138}, /* */ - {'i', '"', 139}, /* */ - {'i', '^', 140}, /* */ - {'i', '`', 141}, /* */ - {'A', '"', 142}, /* */ - {'A', '@', 143}, /* */ - {'E', '\'', 144}, /* */ - {'a', 'e', 145}, /* */ - {'A', 'E', 146}, /* */ - {'o', '^', 147}, /* */ - {'o', '"', 148}, /* */ - {'o', '`', 149}, /* */ - {'u', '^', 150}, /* */ - {'u', '`', 151}, /* */ - {'y', '"', 152}, /* */ - {'O', '"', 153}, /* */ - {'U', '"', 154}, /* */ - {'c', '|', 155}, /* */ - {'$', '$', 156}, /* */ + {'e', '"', 137}, /* */ + {'e', '`', 138}, /* */ + {'i', '"', 139}, /* */ + {'i', '^', 140}, /* */ + {'i', '`', 141}, /* */ + {'A', '"', 142}, /* */ + {'A', '@', 143}, /* */ + {'E', '\'', 144}, /* */ + {'a', 'e', 145}, /* */ + {'A', 'E', 146}, /* */ + {'o', '^', 147}, /* */ + {'o', '"', 148}, /* */ + {'o', '`', 149}, /* */ + {'u', '^', 150}, /* */ + {'u', '`', 151}, /* */ + {'y', '"', 152}, /* */ + {'O', '"', 153}, /* */ + {'U', '"', 154}, /* */ + {'c', '|', 155}, /* */ + {'$', '$', 156}, /* */ {'Y', '-', 157}, /* ~] XX */ - {'s', 's', 158}, /* */ - {'f', 'f', 159}, /* */ - {'a', '\'', 160}, /* */ - {'i', '\'', 161}, /* */ - {'o', '\'', 162}, /* */ - {'u', '\'', 163}, /* */ - {'n', '~', 164}, /* */ - {'N', '~', 165}, /* */ - {'a', 'a', 166}, /* */ - {'o', 'o', 167}, /* */ - {'~', '?', 168}, /* */ - {'-', 'a', 169}, /* */ - {'a', '-', 170}, /* */ - {'1', '2', 171}, /* */ - {'1', '4', 172}, /* */ - {'~', '!', 173}, /* */ - {'<', '<', 174}, /* */ - {'>', '>', 175}, /* */ - {'j', 'u', 230}, /* */ - {'o', '/', 237}, /* */ - {'+', '-', 241}, /* */ - {'>', '=', 242}, /* */ - {'<', '=', 243}, /* */ - {':', '-', 246}, /* */ - {'~', '~', 247}, /* */ - {'~', 'o', 248}, /* */ - {'2', '2', 253}, /* */ + {'s', 's', 158}, /* */ + {'f', 'f', 159}, /* */ + {'a', '\'', 160}, /* */ + {'i', '\'', 161}, /* ¡ */ + {'o', '\'', 162}, /* ¢ */ + {'u', '\'', 163}, /* £ */ + {'n', '~', 164}, /* ¤ */ + {'N', '~', 165}, /* ¥ */ + {'a', 'a', 166}, /* ¦ */ + {'o', 'o', 167}, /* § */ + {'~', '?', 168}, /* ¨ */ + {'-', 'a', 169}, /* © */ + {'a', '-', 170}, /* ª */ + {'1', '2', 171}, /* « */ + {'1', '4', 172}, /* ¬ */ + {'~', '!', 173}, /* */ + {'<', '<', 174}, /* ® */ + {'>', '>', 175}, /* ¯ */ + {'j', 'u', 230}, /* æ */ + {'o', '/', 237}, /* í */ + {'+', '-', 241}, /* ñ */ + {'>', '=', 242}, /* ò */ + {'<', '=', 243}, /* ó */ + {':', '-', 246}, /* ö */ + {'~', '~', 247}, /* ÷ */ + {'~', 'o', 248}, /* ø */ + {'2', '2', 253}, /* ý */ {NUL, NUL, NUL} }; @@ -105,100 +105,100 @@ static digr_T digraphdefault[] = /* * different HPUX digraphs */ - {{'A', '`', 161}, /* */ - {'A', '^', 162}, /* */ - {'E', '`', 163}, /* */ - {'E', '^', 164}, /* */ - {'E', '"', 165}, /* */ - {'I', '^', 166}, /* */ - {'I', '"', 167}, /* */ - {'\'', '\'', 168}, /* */ - {'`', '`', 169}, /* */ - {'^', '^', 170}, /* */ - {'"', '"', 171}, /* */ - {'~', '~', 172}, /* */ - {'U', '`', 173}, /* */ - {'U', '^', 174}, /* */ - {'L', '=', 175}, /* */ - {'~', '_', 176}, /* */ - {'Y', '\'', 177}, /* */ - {'y', '\'', 178}, /* */ - {'~', 'o', 179}, /* */ - {'C', ',', 180}, /* */ - {'c', ',', 181}, /* */ - {'N', '~', 182}, /* */ - {'n', '~', 183}, /* */ - {'~', '!', 184}, /* */ - {'~', '?', 185}, /* */ - {'o', 'x', 186}, /* */ - {'L', '-', 187}, /* */ - {'Y', '=', 188}, /* */ - {'p', 'p', 189}, /* */ - {'f', 'l', 190}, /* */ - {'c', '|', 191}, /* */ - {'a', '^', 192}, /* */ - {'e', '^', 193}, /* */ - {'o', '^', 194}, /* */ - {'u', '^', 195}, /* */ - {'a', '\'', 196}, /* */ - {'e', '\'', 197}, /* */ - {'o', '\'', 198}, /* */ - {'u', '\'', 199}, /* */ - {'a', '`', 200}, /* */ - {'e', '`', 201}, /* */ - {'o', '`', 202}, /* */ - {'u', '`', 203}, /* */ - {'a', '"', 204}, /* */ - {'e', '"', 205}, /* */ - {'o', '"', 206}, /* */ - {'u', '"', 207}, /* */ - {'A', 'o', 208}, /* */ - {'i', '^', 209}, /* */ - {'O', '/', 210}, /* */ - {'A', 'E', 211}, /* */ - {'a', 'o', 212}, /* */ - {'i', '\'', 213}, /* */ - {'o', '/', 214}, /* */ - {'a', 'e', 215}, /* */ - {'A', '"', 216}, /* */ - {'i', '`', 217}, /* */ - {'O', '"', 218}, /* */ - {'U', '"', 219}, /* */ - {'E', '\'', 220}, /* */ - {'i', '"', 221}, /* */ - {'s', 's', 222}, /* */ - {'O', '^', 223}, /* */ - {'A', '\'', 224}, /* */ - {'A', '~', 225}, /* */ - {'a', '~', 226}, /* */ - {'D', '-', 227}, /* */ - {'d', '-', 228}, /* */ - {'I', '\'', 229}, /* */ - {'I', '`', 230}, /* */ - {'O', '\'', 231}, /* */ - {'O', '`', 232}, /* */ - {'O', '~', 233}, /* */ - {'o', '~', 234}, /* */ - {'S', '~', 235}, /* */ - {'s', '~', 236}, /* */ - {'U', '\'', 237}, /* */ - {'Y', '"', 238}, /* */ - {'y', '"', 239}, /* */ - {'p', '-', 240}, /* */ - {'p', '~', 241}, /* */ - {'~', '.', 242}, /* */ - {'j', 'u', 243}, /* */ - {'P', 'p', 244}, /* */ - {'3', '4', 245}, /* */ - {'-', '-', 246}, /* */ - {'1', '4', 247}, /* */ - {'1', '2', 248}, /* */ - {'a', '_', 249}, /* */ - {'o', '_', 250}, /* */ - {'<', '<', 251}, /* */ - {'x', 'x', 252}, /* */ - {'>', '>', 253}, /* */ - {'+', '-', 254}, /* */ + {{'A', '`', 161}, /* ¡ */ + {'A', '^', 162}, /* ¢ */ + {'E', '`', 163}, /* £ */ + {'E', '^', 164}, /* ¤ */ + {'E', '"', 165}, /* ¥ */ + {'I', '^', 166}, /* ¦ */ + {'I', '"', 167}, /* § */ + {'\'', '\'', 168}, /* ¨ */ + {'`', '`', 169}, /* © */ + {'^', '^', 170}, /* ª */ + {'"', '"', 171}, /* « */ + {'~', '~', 172}, /* ¬ */ + {'U', '`', 173}, /* */ + {'U', '^', 174}, /* ® */ + {'L', '=', 175}, /* ¯ */ + {'~', '_', 176}, /* ° */ + {'Y', '\'', 177}, /* ± */ + {'y', '\'', 178}, /* ² */ + {'~', 'o', 179}, /* ³ */ + {'C', ',', 180}, /* ´ */ + {'c', ',', 181}, /* µ */ + {'N', '~', 182}, /* ¶ */ + {'n', '~', 183}, /* · */ + {'~', '!', 184}, /* ¸ */ + {'~', '?', 185}, /* ¹ */ + {'o', 'x', 186}, /* º */ + {'L', '-', 187}, /* » */ + {'Y', '=', 188}, /* ¼ */ + {'p', 'p', 189}, /* ½ */ + {'f', 'l', 190}, /* ¾ */ + {'c', '|', 191}, /* ¿ */ + {'a', '^', 192}, /* À */ + {'e', '^', 193}, /* Á */ + {'o', '^', 194}, /* Â */ + {'u', '^', 195}, /* Ã */ + {'a', '\'', 196}, /* Ä */ + {'e', '\'', 197}, /* Å */ + {'o', '\'', 198}, /* Æ */ + {'u', '\'', 199}, /* Ç */ + {'a', '`', 200}, /* È */ + {'e', '`', 201}, /* É */ + {'o', '`', 202}, /* Ê */ + {'u', '`', 203}, /* Ë */ + {'a', '"', 204}, /* Ì */ + {'e', '"', 205}, /* Í */ + {'o', '"', 206}, /* Î */ + {'u', '"', 207}, /* Ï */ + {'A', 'o', 208}, /* Ð */ + {'i', '^', 209}, /* Ñ */ + {'O', '/', 210}, /* Ò */ + {'A', 'E', 211}, /* Ó */ + {'a', 'o', 212}, /* Ô */ + {'i', '\'', 213}, /* Õ */ + {'o', '/', 214}, /* Ö */ + {'a', 'e', 215}, /* × */ + {'A', '"', 216}, /* Ø */ + {'i', '`', 217}, /* Ù */ + {'O', '"', 218}, /* Ú */ + {'U', '"', 219}, /* Û */ + {'E', '\'', 220}, /* Ü */ + {'i', '"', 221}, /* Ý */ + {'s', 's', 222}, /* Þ */ + {'O', '^', 223}, /* ß */ + {'A', '\'', 224}, /* à */ + {'A', '~', 225}, /* á */ + {'a', '~', 226}, /* â */ + {'D', '-', 227}, /* ã */ + {'d', '-', 228}, /* ä */ + {'I', '\'', 229}, /* å */ + {'I', '`', 230}, /* æ */ + {'O', '\'', 231}, /* ç */ + {'O', '`', 232}, /* è */ + {'O', '~', 233}, /* é */ + {'o', '~', 234}, /* ê */ + {'S', '~', 235}, /* ë */ + {'s', '~', 236}, /* ì */ + {'U', '\'', 237}, /* í */ + {'Y', '"', 238}, /* î */ + {'y', '"', 239}, /* ï */ + {'p', '-', 240}, /* ð */ + {'p', '~', 241}, /* ñ */ + {'~', '.', 242}, /* ò */ + {'j', 'u', 243}, /* ó */ + {'P', 'p', 244}, /* ô */ + {'3', '4', 245}, /* õ */ + {'-', '-', 246}, /* ö */ + {'1', '4', 247}, /* ÷ */ + {'1', '2', 248}, /* ø */ + {'a', '_', 249}, /* ù */ + {'o', '_', 250}, /* ú */ + {'<', '<', 251}, /* û */ + {'x', 'x', 252}, /* ü */ + {'>', '>', 253}, /* ý */ + {'+', '-', 254}, /* þ */ {'n', 'u', 255}, /* x XX */ {NUL, NUL, NUL} }; @@ -211,107 +211,107 @@ static digr_T digraphdefault[] = * EBCDIC - ISO digraphs * TODO: EBCDIC Table is Code-Page 1047 */ - {{'a', '^', 66}, /* */ - {'a', '"', 67}, /* */ - {'a', '`', 68}, /* */ - {'a', '\'', 69}, /* */ - {'a', '~', 70}, /* */ - {'a', '@', 71}, /* */ - {'a', 'a', 71}, /* */ - {'c', ',', 72}, /* */ - {'n', '~', 73}, /* */ - {'c', '|', 74}, /* */ - {'e', '\'', 81}, /* */ - {'e', '^', 82}, /* */ - {'e', '"', 83}, /* */ - {'e', '`', 84}, /* */ - {'i', '\'', 85}, /* */ - {'i', '^', 86}, /* */ - {'i', '"', 87}, /* */ - {'i', '`', 88}, /* */ - {'s', 's', 89}, /* */ - {'A', '^', 98}, /* */ - {'A', '"', 99}, /* */ - {'A', '`', 100}, /* */ - {'A', '\'', 101}, /* */ - {'A', '~', 102}, /* */ - {'A', '@', 103}, /* */ - {'A', 'A', 103}, /* */ - {'C', ',', 104}, /* */ - {'N', '~', 105}, /* */ - {'|', '|', 106}, /* */ - {'o', '/', 112}, /* */ - {'E', '\'', 113}, /* */ - {'E', '^', 114}, /* */ - {'E', '"', 115}, /* */ - {'E', '`', 116}, /* */ - {'I', '\'', 117}, /* */ - {'I', '^', 118}, /* */ - {'I', '"', 119}, /* */ - {'I', '`', 120}, /* */ + {{'a', '^', 66}, /* â */ + {'a', '"', 67}, /* ä */ + {'a', '`', 68}, /* à */ + {'a', '\'', 69}, /* á */ + {'a', '~', 70}, /* ã */ + {'a', '@', 71}, /* å */ + {'a', 'a', 71}, /* å */ + {'c', ',', 72}, /* ç */ + {'n', '~', 73}, /* ñ */ + {'c', '|', 74}, /* ¢ */ + {'e', '\'', 81}, /* é */ + {'e', '^', 82}, /* ê */ + {'e', '"', 83}, /* ë */ + {'e', '`', 84}, /* è */ + {'i', '\'', 85}, /* í */ + {'i', '^', 86}, /* î */ + {'i', '"', 87}, /* ï */ + {'i', '`', 88}, /* ì */ + {'s', 's', 89}, /* ß */ + {'A', '^', 98}, /* Â */ + {'A', '"', 99}, /* Ä */ + {'A', '`', 100}, /* À */ + {'A', '\'', 101}, /* Á */ + {'A', '~', 102}, /* Ã */ + {'A', '@', 103}, /* Å */ + {'A', 'A', 103}, /* Å */ + {'C', ',', 104}, /* Ç */ + {'N', '~', 105}, /* Ñ */ + {'|', '|', 106}, /* ¦ */ + {'o', '/', 112}, /* ø */ + {'E', '\'', 113}, /* É */ + {'E', '^', 114}, /* Ê */ + {'E', '"', 115}, /* Ë */ + {'E', '`', 116}, /* È */ + {'I', '\'', 117}, /* Í */ + {'I', '^', 118}, /* Î */ + {'I', '"', 119}, /* Ï */ + {'I', '`', 120}, /* Ì */ {'O', '/', 128}, /* 0/ XX */ - {'<', '<', 138}, /* */ - {'>', '>', 139}, /* */ - {'d', '-', 140}, /* */ - {'y', '\'', 141}, /* */ - {'i', 'p', 142}, /* */ - {'+', '-', 143}, /* */ - {'~', 'o', 144}, /* */ - {'a', '-', 154}, /* */ - {'o', '-', 155}, /* */ - {'a', 'e', 156}, /* */ + {'<', '<', 138}, /* « */ + {'>', '>', 139}, /* » */ + {'d', '-', 140}, /* ð */ + {'y', '\'', 141}, /* ý */ + {'i', 'p', 142}, /* þ */ + {'+', '-', 143}, /* ± */ + {'~', 'o', 144}, /* ° */ + {'a', '-', 154}, /* ª */ + {'o', '-', 155}, /* º */ + {'a', 'e', 156}, /* æ */ {',', ',', 157}, /* , XX */ - {'A', 'E', 158}, /* */ - {'o', 'x', 159}, /* - currency symbol in ISO 8859-1 */ - {'e', '=', 159}, /* - euro symbol in ISO 8859-15 */ - {'E', 'u', 159}, /* - euro symbol in ISO 8859-15 */ - {'j', 'u', 160}, /* */ + {'A', 'E', 158}, /* Æ */ + {'o', 'x', 159}, /* ¤ - currency symbol in ISO 8859-1 */ + {'e', '=', 159}, /* ¤ - euro symbol in ISO 8859-15 */ + {'E', 'u', 159}, /* ¤ - euro symbol in ISO 8859-15 */ + {'j', 'u', 160}, /* µ */ {'y', '"', 167}, /* x XX */ - {'~', '!', 170}, /* */ - {'~', '?', 171}, /* */ - {'D', '-', 172}, /* */ - {'I', 'p', 174}, /* */ - {'r', 'O', 175}, /* */ - {'-', ',', 176}, /* */ - {'$', '$', 177}, /* */ - {'Y', '-', 178}, /* */ - {'~', '.', 179}, /* */ - {'c', 'O', 180}, /* */ - {'p', 'a', 181}, /* */ - {'p', 'p', 182}, /* */ - {'1', '4', 183}, /* */ - {'1', '2', 184}, /* */ - {'3', '4', 185}, /* */ - {'Y', '\'', 186}, /* */ - {'"', '"', 187}, /* */ - {'-', '=', 188}, /* */ - {'\'', '\'', 190}, /* */ - {'O', 'E', 191}, /* - OE in ISO 8859-15 */ - {'/', '\\', 191}, /* - multiplication symbol in ISO 8859-1 */ - {'-', '-', 202}, /* */ - {'o', '^', 203}, /* */ - {'o', '"', 204}, /* */ - {'o', '`', 205}, /* */ - {'o', '\'', 206}, /* */ - {'o', '~', 207}, /* */ - {'1', '1', 218}, /* */ - {'u', '^', 219}, /* */ - {'u', '"', 220}, /* */ - {'u', '`', 221}, /* */ - {'u', '\'', 222}, /* */ - {':', '-', 225}, /* - division symbol in ISO 8859-1 */ - {'o', 'e', 225}, /* - oe in ISO 8859-15 */ - {'2', '2', 234}, /* */ - {'O', '^', 235}, /* */ - {'O', '"', 236}, /* */ - {'O', '`', 237}, /* */ - {'O', '\'', 238}, /* */ - {'O', '~', 239}, /* */ - {'3', '3', 250}, /* */ - {'U', '^', 251}, /* */ - {'U', '"', 252}, /* */ - {'U', '`', 253}, /* */ - {'U', '\'', 254}, /* */ + {'~', '!', 170}, /* ¡ */ + {'~', '?', 171}, /* ¿ */ + {'D', '-', 172}, /* Ð */ + {'I', 'p', 174}, /* Þ */ + {'r', 'O', 175}, /* ® */ + {'-', ',', 176}, /* ¬ */ + {'$', '$', 177}, /* £ */ + {'Y', '-', 178}, /* ¥ */ + {'~', '.', 179}, /* · */ + {'c', 'O', 180}, /* © */ + {'p', 'a', 181}, /* § */ + {'p', 'p', 182}, /* ¶ */ + {'1', '4', 183}, /* ¼ */ + {'1', '2', 184}, /* ½ */ + {'3', '4', 185}, /* ¾ */ + {'Y', '\'', 186}, /* Ý */ + {'"', '"', 187}, /* ¨ */ + {'-', '=', 188}, /* ¯ */ + {'\'', '\'', 190}, /* ´ */ + {'O', 'E', 191}, /* × - OE in ISO 8859-15 */ + {'/', '\\', 191}, /* × - multiplication symbol in ISO 8859-1 */ + {'-', '-', 202}, /* */ + {'o', '^', 203}, /* ô */ + {'o', '"', 204}, /* ö */ + {'o', '`', 205}, /* ò */ + {'o', '\'', 206}, /* ó */ + {'o', '~', 207}, /* õ */ + {'1', '1', 218}, /* ¹ */ + {'u', '^', 219}, /* û */ + {'u', '"', 220}, /* ü */ + {'u', '`', 221}, /* ù */ + {'u', '\'', 222}, /* ú */ + {':', '-', 225}, /* ÷ - division symbol in ISO 8859-1 */ + {'o', 'e', 225}, /* ÷ - oe in ISO 8859-15 */ + {'2', '2', 234}, /* ² */ + {'O', '^', 235}, /* Ô */ + {'O', '"', 236}, /* Ö */ + {'O', '`', 237}, /* Ò */ + {'O', '\'', 238}, /* Ó */ + {'O', '~', 239}, /* Õ */ + {'3', '3', 250}, /* ³ */ + {'U', '^', 251}, /* Û */ + {'U', '"', 252}, /* Ü */ + {'U', '`', 253}, /* Ù */ + {'U', '\'', 254}, /* Ú */ {NUL, NUL, NUL} }; @@ -321,105 +321,105 @@ static digr_T digraphdefault[] = /* * digraphs compatible with Vim 5.x */ - {{'~', '!', 161}, /* */ - {'c', '|', 162}, /* */ - {'$', '$', 163}, /* */ - {'o', 'x', 164}, /* - currency symbol in ISO 8859-1 */ - {'e', '=', 164}, /* - euro symbol in ISO 8859-15 */ - {'Y', '-', 165}, /* */ - {'|', '|', 166}, /* */ - {'p', 'a', 167}, /* */ - {'"', '"', 168}, /* */ - {'c', 'O', 169}, /* */ - {'a', '-', 170}, /* */ - {'<', '<', 171}, /* */ - {'-', ',', 172}, /* */ - {'-', '-', 173}, /* */ - {'r', 'O', 174}, /* */ - {'-', '=', 175}, /* */ - {'~', 'o', 176}, /* */ - {'+', '-', 177}, /* */ - {'2', '2', 178}, /* */ - {'3', '3', 179}, /* */ - {'\'', '\'', 180}, /* */ - {'j', 'u', 181}, /* */ - {'p', 'p', 182}, /* */ - {'~', '.', 183}, /* */ - {',', ',', 184}, /* */ - {'1', '1', 185}, /* */ - {'o', '-', 186}, /* */ - {'>', '>', 187}, /* */ - {'1', '4', 188}, /* */ - {'1', '2', 189}, /* */ - {'3', '4', 190}, /* */ - {'~', '?', 191}, /* */ - {'A', '`', 192}, /* */ - {'A', '\'', 193}, /* */ - {'A', '^', 194}, /* */ - {'A', '~', 195}, /* */ - {'A', '"', 196}, /* */ - {'A', '@', 197}, /* */ - {'A', 'A', 197}, /* */ - {'A', 'E', 198}, /* */ - {'C', ',', 199}, /* */ - {'E', '`', 200}, /* */ - {'E', '\'', 201}, /* */ - {'E', '^', 202}, /* */ - {'E', '"', 203}, /* */ - {'I', '`', 204}, /* */ - {'I', '\'', 205}, /* */ - {'I', '^', 206}, /* */ - {'I', '"', 207}, /* */ - {'D', '-', 208}, /* */ - {'N', '~', 209}, /* */ - {'O', '`', 210}, /* */ - {'O', '\'', 211}, /* */ - {'O', '^', 212}, /* */ - {'O', '~', 213}, /* */ - {'O', '"', 214}, /* */ - {'/', '\\', 215}, /* - multiplication symbol in ISO 8859-1 */ - {'O', 'E', 215}, /* - OE in ISO 8859-15 */ - {'O', '/', 216}, /* */ - {'U', '`', 217}, /* */ - {'U', '\'', 218}, /* */ - {'U', '^', 219}, /* */ - {'U', '"', 220}, /* */ - {'Y', '\'', 221}, /* */ - {'I', 'p', 222}, /* */ - {'s', 's', 223}, /* */ - {'a', '`', 224}, /* */ - {'a', '\'', 225}, /* */ - {'a', '^', 226}, /* */ - {'a', '~', 227}, /* */ - {'a', '"', 228}, /* */ - {'a', '@', 229}, /* */ - {'a', 'a', 229}, /* */ - {'a', 'e', 230}, /* */ - {'c', ',', 231}, /* */ - {'e', '`', 232}, /* */ - {'e', '\'', 233}, /* */ - {'e', '^', 234}, /* */ - {'e', '"', 235}, /* */ - {'i', '`', 236}, /* */ - {'i', '\'', 237}, /* */ - {'i', '^', 238}, /* */ - {'i', '"', 239}, /* */ - {'d', '-', 240}, /* */ - {'n', '~', 241}, /* */ - {'o', '`', 242}, /* */ - {'o', '\'', 243}, /* */ - {'o', '^', 244}, /* */ - {'o', '~', 245}, /* */ - {'o', '"', 246}, /* */ - {':', '-', 247}, /* - division symbol in ISO 8859-1 */ - {'o', 'e', 247}, /* - oe in ISO 8859-15 */ - {'o', '/', 248}, /* */ - {'u', '`', 249}, /* */ - {'u', '\'', 250}, /* */ - {'u', '^', 251}, /* */ - {'u', '"', 252}, /* */ - {'y', '\'', 253}, /* */ - {'i', 'p', 254}, /* */ + {{'~', '!', 161}, /* ¡ */ + {'c', '|', 162}, /* ¢ */ + {'$', '$', 163}, /* £ */ + {'o', 'x', 164}, /* ¤ - currency symbol in ISO 8859-1 */ + {'e', '=', 164}, /* ¤ - euro symbol in ISO 8859-15 */ + {'Y', '-', 165}, /* ¥ */ + {'|', '|', 166}, /* ¦ */ + {'p', 'a', 167}, /* § */ + {'"', '"', 168}, /* ¨ */ + {'c', 'O', 169}, /* © */ + {'a', '-', 170}, /* ª */ + {'<', '<', 171}, /* « */ + {'-', ',', 172}, /* ¬ */ + {'-', '-', 173}, /* */ + {'r', 'O', 174}, /* ® */ + {'-', '=', 175}, /* ¯ */ + {'~', 'o', 176}, /* ° */ + {'+', '-', 177}, /* ± */ + {'2', '2', 178}, /* ² */ + {'3', '3', 179}, /* ³ */ + {'\'', '\'', 180}, /* ´ */ + {'j', 'u', 181}, /* µ */ + {'p', 'p', 182}, /* ¶ */ + {'~', '.', 183}, /* · */ + {',', ',', 184}, /* ¸ */ + {'1', '1', 185}, /* ¹ */ + {'o', '-', 186}, /* º */ + {'>', '>', 187}, /* » */ + {'1', '4', 188}, /* ¼ */ + {'1', '2', 189}, /* ½ */ + {'3', '4', 190}, /* ¾ */ + {'~', '?', 191}, /* ¿ */ + {'A', '`', 192}, /* À */ + {'A', '\'', 193}, /* Á */ + {'A', '^', 194}, /* Â */ + {'A', '~', 195}, /* Ã */ + {'A', '"', 196}, /* Ä */ + {'A', '@', 197}, /* Å */ + {'A', 'A', 197}, /* Å */ + {'A', 'E', 198}, /* Æ */ + {'C', ',', 199}, /* Ç */ + {'E', '`', 200}, /* È */ + {'E', '\'', 201}, /* É */ + {'E', '^', 202}, /* Ê */ + {'E', '"', 203}, /* Ë */ + {'I', '`', 204}, /* Ì */ + {'I', '\'', 205}, /* Í */ + {'I', '^', 206}, /* Î */ + {'I', '"', 207}, /* Ï */ + {'D', '-', 208}, /* Ð */ + {'N', '~', 209}, /* Ñ */ + {'O', '`', 210}, /* Ò */ + {'O', '\'', 211}, /* Ó */ + {'O', '^', 212}, /* Ô */ + {'O', '~', 213}, /* Õ */ + {'O', '"', 214}, /* Ö */ + {'/', '\\', 215}, /* × - multiplication symbol in ISO 8859-1 */ + {'O', 'E', 215}, /* × - OE in ISO 8859-15 */ + {'O', '/', 216}, /* Ø */ + {'U', '`', 217}, /* Ù */ + {'U', '\'', 218}, /* Ú */ + {'U', '^', 219}, /* Û */ + {'U', '"', 220}, /* Ü */ + {'Y', '\'', 221}, /* Ý */ + {'I', 'p', 222}, /* Þ */ + {'s', 's', 223}, /* ß */ + {'a', '`', 224}, /* à */ + {'a', '\'', 225}, /* á */ + {'a', '^', 226}, /* â */ + {'a', '~', 227}, /* ã */ + {'a', '"', 228}, /* ä */ + {'a', '@', 229}, /* å */ + {'a', 'a', 229}, /* å */ + {'a', 'e', 230}, /* æ */ + {'c', ',', 231}, /* ç */ + {'e', '`', 232}, /* è */ + {'e', '\'', 233}, /* é */ + {'e', '^', 234}, /* ê */ + {'e', '"', 235}, /* ë */ + {'i', '`', 236}, /* ì */ + {'i', '\'', 237}, /* í */ + {'i', '^', 238}, /* î */ + {'i', '"', 239}, /* ï */ + {'d', '-', 240}, /* ð */ + {'n', '~', 241}, /* ñ */ + {'o', '`', 242}, /* ò */ + {'o', '\'', 243}, /* ó */ + {'o', '^', 244}, /* ô */ + {'o', '~', 245}, /* õ */ + {'o', '"', 246}, /* ö */ + {':', '-', 247}, /* ÷ - division symbol in ISO 8859-1 */ + {'o', 'e', 247}, /* ÷ - oe in ISO 8859-15 */ + {'o', '/', 248}, /* ø */ + {'u', '`', 249}, /* ù */ + {'u', '\'', 250}, /* ú */ + {'u', '^', 251}, /* û */ + {'u', '"', 252}, /* ü */ + {'y', '\'', 253}, /* ý */ + {'i', 'p', 254}, /* þ */ {'y', '"', 255}, /* x XX */ {NUL, NUL, NUL} }; @@ -511,147 +511,147 @@ static digr_T digraphdefault[] = {'N', 'S', 0xa0}, #define DG_START_LATIN 0xa1 {'!', 'I', 0xa1}, - {'~', '!', 0xa1}, // Vim 5.x compatible + {'~', '!', 0xa1}, // ¡ Vim 5.x compatible {'C', 't', 0xa2}, - {'c', '|', 0xa2}, // Vim 5.x compatible + {'c', '|', 0xa2}, // ¢ Vim 5.x compatible {'P', 'd', 0xa3}, - {'$', '$', 0xa3}, // Vim 5.x compatible + {'$', '$', 0xa3}, // £ Vim 5.x compatible {'C', 'u', 0xa4}, - {'o', 'x', 0xa4}, // Vim 5.x compatible + {'o', 'x', 0xa4}, // ¤ Vim 5.x compatible {'Y', 'e', 0xa5}, - {'Y', '-', 0xa5}, // Vim 5.x compatible + {'Y', '-', 0xa5}, // ¥ Vim 5.x compatible {'B', 'B', 0xa6}, - {'|', '|', 0xa6}, // Vim 5.x compatible + {'|', '|', 0xa6}, // ¦ Vim 5.x compatible {'S', 'E', 0xa7}, {'\'', ':', 0xa8}, {'C', 'o', 0xa9}, - {'c', 'O', 0xa9}, // Vim 5.x compatible + {'c', 'O', 0xa9}, // © Vim 5.x compatible {'-', 'a', 0xaa}, {'<', '<', 0xab}, {'N', 'O', 0xac}, - {'-', ',', 0xac}, // Vim 5.x compatible + {'-', ',', 0xac}, // ¬ Vim 5.x compatible {'-', '-', 0xad}, {'R', 'g', 0xae}, {'\'', 'm', 0xaf}, - {'-', '=', 0xaf}, // Vim 5.x compatible + {'-', '=', 0xaf}, // ¯ Vim 5.x compatible {'D', 'G', 0xb0}, - {'~', 'o', 0xb0}, // Vim 5.x compatible + {'~', 'o', 0xb0}, // ° Vim 5.x compatible {'+', '-', 0xb1}, {'2', 'S', 0xb2}, - {'2', '2', 0xb2}, // Vim 5.x compatible + {'2', '2', 0xb2}, // ² Vim 5.x compatible {'3', 'S', 0xb3}, - {'3', '3', 0xb3}, // Vim 5.x compatible + {'3', '3', 0xb3}, // ³ Vim 5.x compatible {'\'', '\'', 0xb4}, {'M', 'y', 0xb5}, {'P', 'I', 0xb6}, - {'p', 'p', 0xb6}, // Vim 5.x compatible + {'p', 'p', 0xb6}, // ¶ Vim 5.x compatible {'.', 'M', 0xb7}, - {'~', '.', 0xb7}, // Vim 5.x compatible + {'~', '.', 0xb7}, // · Vim 5.x compatible {'\'', ',', 0xb8}, {'1', 'S', 0xb9}, - {'1', '1', 0xb9}, // Vim 5.x compatible + {'1', '1', 0xb9}, // ¹ Vim 5.x compatible {'-', 'o', 0xba}, {'>', '>', 0xbb}, {'1', '4', 0xbc}, {'1', '2', 0xbd}, {'3', '4', 0xbe}, {'?', 'I', 0xbf}, - {'~', '?', 0xbf}, // Vim 5.x compatible + {'~', '?', 0xbf}, // ¿ Vim 5.x compatible {'A', '!', 0xc0}, - {'A', '`', 0xc0}, // Vim 5.x compatible + {'A', '`', 0xc0}, // À Vim 5.x compatible {'A', '\'', 0xc1}, {'A', '>', 0xc2}, - {'A', '^', 0xc2}, // Vim 5.x compatible + {'A', '^', 0xc2}, // Â Vim 5.x compatible {'A', '?', 0xc3}, - {'A', '~', 0xc3}, // Vim 5.x compatible + {'A', '~', 0xc3}, // Ã Vim 5.x compatible {'A', ':', 0xc4}, - {'A', '"', 0xc4}, // Vim 5.x compatible + {'A', '"', 0xc4}, // Ä Vim 5.x compatible {'A', 'A', 0xc5}, - {'A', '@', 0xc5}, // Vim 5.x compatible + {'A', '@', 0xc5}, // Å Vim 5.x compatible {'A', 'E', 0xc6}, {'C', ',', 0xc7}, {'E', '!', 0xc8}, - {'E', '`', 0xc8}, // Vim 5.x compatible + {'E', '`', 0xc8}, // È Vim 5.x compatible {'E', '\'', 0xc9}, {'E', '>', 0xca}, - {'E', '^', 0xca}, // Vim 5.x compatible + {'E', '^', 0xca}, // Ê Vim 5.x compatible {'E', ':', 0xcb}, - {'E', '"', 0xcb}, // Vim 5.x compatible + {'E', '"', 0xcb}, // Ë Vim 5.x compatible {'I', '!', 0xcc}, - {'I', '`', 0xcc}, // Vim 5.x compatible + {'I', '`', 0xcc}, // Ì Vim 5.x compatible {'I', '\'', 0xcd}, {'I', '>', 0xce}, - {'I', '^', 0xce}, // Vim 5.x compatible + {'I', '^', 0xce}, // Î Vim 5.x compatible {'I', ':', 0xcf}, - {'I', '"', 0xcf}, // Vim 5.x compatible + {'I', '"', 0xcf}, // Ï Vim 5.x compatible {'D', '-', 0xd0}, {'N', '?', 0xd1}, - {'N', '~', 0xd1}, // Vim 5.x compatible + {'N', '~', 0xd1}, // Ñ Vim 5.x compatible {'O', '!', 0xd2}, - {'O', '`', 0xd2}, // Vim 5.x compatible + {'O', '`', 0xd2}, // Ò Vim 5.x compatible {'O', '\'', 0xd3}, {'O', '>', 0xd4}, - {'O', '^', 0xd4}, // Vim 5.x compatible + {'O', '^', 0xd4}, // Ô Vim 5.x compatible {'O', '?', 0xd5}, - {'O', '~', 0xd5}, // Vim 5.x compatible + {'O', '~', 0xd5}, // Õ Vim 5.x compatible {'O', ':', 0xd6}, {'*', 'X', 0xd7}, - {'/', '\\', 0xd7}, // Vim 5.x compatible + {'/', '\\', 0xd7}, // × Vim 5.x compatible {'O', '/', 0xd8}, {'U', '!', 0xd9}, - {'U', '`', 0xd9}, // Vim 5.x compatible + {'U', '`', 0xd9}, // Ù Vim 5.x compatible {'U', '\'', 0xda}, {'U', '>', 0xdb}, - {'U', '^', 0xdb}, // Vim 5.x compatible + {'U', '^', 0xdb}, // Û Vim 5.x compatible {'U', ':', 0xdc}, {'Y', '\'', 0xdd}, {'T', 'H', 0xde}, - {'I', 'p', 0xde}, // Vim 5.x compatible + {'I', 'p', 0xde}, // Þ Vim 5.x compatible {'s', 's', 0xdf}, {'a', '!', 0xe0}, - {'a', '`', 0xe0}, // Vim 5.x compatible + {'a', '`', 0xe0}, // à Vim 5.x compatible {'a', '\'', 0xe1}, {'a', '>', 0xe2}, - {'a', '^', 0xe2}, // Vim 5.x compatible + {'a', '^', 0xe2}, // â Vim 5.x compatible {'a', '?', 0xe3}, - {'a', '~', 0xe3}, // Vim 5.x compatible + {'a', '~', 0xe3}, // ã Vim 5.x compatible {'a', ':', 0xe4}, - {'a', '"', 0xe4}, // Vim 5.x compatible + {'a', '"', 0xe4}, // ä Vim 5.x compatible {'a', 'a', 0xe5}, - {'a', '@', 0xe5}, // Vim 5.x compatible + {'a', '@', 0xe5}, // å Vim 5.x compatible {'a', 'e', 0xe6}, {'c', ',', 0xe7}, {'e', '!', 0xe8}, - {'e', '`', 0xe8}, // Vim 5.x compatible + {'e', '`', 0xe8}, // è Vim 5.x compatible {'e', '\'', 0xe9}, {'e', '>', 0xea}, - {'e', '^', 0xea}, // Vim 5.x compatible + {'e', '^', 0xea}, // ê Vim 5.x compatible {'e', ':', 0xeb}, - {'e', '"', 0xeb}, // Vim 5.x compatible + {'e', '"', 0xeb}, // ë Vim 5.x compatible {'i', '!', 0xec}, - {'i', '`', 0xec}, // Vim 5.x compatible + {'i', '`', 0xec}, // ì Vim 5.x compatible {'i', '\'', 0xed}, {'i', '>', 0xee}, - {'i', '^', 0xee}, // Vim 5.x compatible + {'i', '^', 0xee}, // î Vim 5.x compatible {'i', ':', 0xef}, {'d', '-', 0xf0}, {'n', '?', 0xf1}, - {'n', '~', 0xf1}, // Vim 5.x compatible + {'n', '~', 0xf1}, // ñ Vim 5.x compatible {'o', '!', 0xf2}, - {'o', '`', 0xf2}, // Vim 5.x compatible + {'o', '`', 0xf2}, // ò Vim 5.x compatible {'o', '\'', 0xf3}, {'o', '>', 0xf4}, - {'o', '^', 0xf4}, // Vim 5.x compatible + {'o', '^', 0xf4}, // ô Vim 5.x compatible {'o', '?', 0xf5}, - {'o', '~', 0xf5}, // Vim 5.x compatible + {'o', '~', 0xf5}, // õ Vim 5.x compatible {'o', ':', 0xf6}, {'-', ':', 0xf7}, {'o', '/', 0xf8}, {'u', '!', 0xf9}, - {'u', '`', 0xf9}, // Vim 5.x compatible + {'u', '`', 0xf9}, // ù Vim 5.x compatible {'u', '\'', 0xfa}, {'u', '>', 0xfb}, - {'u', '^', 0xfb}, // Vim 5.x compatible + {'u', '^', 0xfb}, // û Vim 5.x compatible {'u', ':', 0xfc}, {'y', '\'', 0xfd}, {'t', 'h', 0xfe}, diff --git a/src/hangulin.c b/src/hangulin.c index 337ea84f4..17142dadf 100644 --- a/src/hangulin.c +++ b/src/hangulin.c @@ -20,9 +20,9 @@ #define AUTOMATA_ERROR 4 #define AUTOMATA_NULL 5 -#define F_F 0x1 /* ʼ (initial sound) */ -#define F_M 0x2 /* (medial vowel) */ -#define F_L 0x4 /* (final consonant) */ +#define F_F 0x1 /* 초성 (initial sound) */ +#define F_M 0x2 /* 중성 (medial vowel) */ +#define F_L 0x4 /* 종성 (final consonant) */ #define F_A 0x8 /* ASCII */ #define F_NULL 1 #define M_NULL 2 @@ -46,10 +46,10 @@ static int convert_3_to_ks(int fv, int mv, int lv, char_u *des); /**********************************************************************/ -/****** 3 ƾ (Routines for 3 bulsik keyboard) ******/ +/****** 3 벌식자판을 위한 루틴 (Routines for 3 bulsik keyboard) ******/ /**********************************************************************/ -/* 3 Ŀ ȯ (3 bulsik keyboard conversion) */ +/* 3 벌식에서 자판 변환 (3 bulsik keyboard conversion) */ static char_u value_table_for_3[] = { @@ -89,7 +89,7 @@ static short_u kind_table_for_3[] = F_F, F_M, F_L, F_L, F_F, F_L, /* u v w x y z */ }; -/* 3 Ŀ (ʼ, Է¿) -> ʼ ó +/* 3 벌식에서 (현재초성, 입력영문) -> 복합초성 처리 * 3 bulsik: (current initial sound, input english) -> compound initial sound. */ @@ -109,7 +109,7 @@ comfcon3(int v, int c) return 0; } -/* 3 Ŀ (, Է ) -> ó +/* 3 벌식에서 (현재모음, 입력 영문) -> 복합 모음 처리 * 3 bulsik: (current vowel, input english) -> compound vowel. */ @@ -118,34 +118,34 @@ comvow3(int v, int c) { switch (v) { - case 13: /* */ + case 13: /* ㅗ */ switch (c) { - case 3: /* Ǥ */ + case 3: /* ㅗㅏ */ return 14; - case 4: /* Ǥ */ + case 4: /* ㅗㅐ */ return 15; - case 29: /* Ǥ */ + case 29: /* ㅗㅣ */ return 18; } break; - case 20: /* */ + case 20: /* ㅜ */ switch (c) { - case 7: /* ̤ */ + case 7: /* ㅜㅓ */ return 21; - case 10: /* ̤ */ + case 10: /* ㅜㅔ */ return 22; - case 29: /* ̤ */ + case 29: /* ㅜㅣ */ return 23; } break; - /* 3 Ѥ Ƿ ... */ + /* 3 벌식 자판은 ㅡㅣ 가 있으므로 ... */ } return 0; } -/* 3 Ŀ ( ħ, Է) -> ħ +/* 3 벌식에서 (현재 받침, 영문자 입력) -> 받침 * 3 bulsik: (current prop(?), input english) -> prop(?). * I want to say, the 'prop' is similar to 'final consonant', but not vowel. * (I cannot find the real english from my dictionary. Sorry!) @@ -157,46 +157,46 @@ comcon3(int k, int c) { switch (k) { - case 2: /* */ + case 2: /* ㄱ */ switch (c) { case 2: - return 3; /* */ + return 3; /* ㄱㄱ */ case 21: - return 4; /* */ + return 4; /* ㄱㅅ */ } break; - case 5: /* */ + case 5: /* ㄴ */ switch (c) { - case 24: /* */ + case 24: /* ㄴㅈ */ return 6; case 29: - return 7; /* */ + return 7; /* ㄴㅎ */ } break; - case 9: /* */ + case 9: /* ㄹ */ switch (c) { - case 2: /* */ + case 2: /* ㄹㄱ */ return 10; - case 17: /* */ + case 17: /* ㄹㅁ */ return 11; - case 19: /* */ + case 19: /* ㄹㅂ */ return 12; - case 21: /* */ + case 21: /* ㄹㅅ */ return 13; - case 27: /* */ + case 27: /* ㄹㅌ */ return 14; - case 28: /* */ + case 28: /* ㄹㅍ */ return 15; - case 29: /* */ + case 29: /* ㄹㅎ */ return 16; } break; case 19: switch (c) { - case 21: /* */ + case 21: /* ㅂㅅ */ return 20; } break; @@ -205,7 +205,7 @@ comcon3(int k, int c) } /**********************************************************************/ -/****** 2 ƾ (Routines for 2 bulsik keyboard) ******/ +/****** 2 벌식자판을 위한 루틴 (Routines for 2 bulsik keyboard) ******/ /**********************************************************************/ static int @@ -227,9 +227,9 @@ kind_table_for_2(int c) return table[c]; } -/* 2 Ŀ -> ʼ ȯ +/* 2 벌식에서 영문자 -> 조합형 초성 변환 * (2 bulsik: conversion english char. to initial sound of compound type) - * : ʼ ƴϸ 0 (If it is not initial sound, return 0). + * 결과: 초성이 아니면 0 (If it is not initial sound, return 0). */ static int fcon(int c) @@ -251,9 +251,9 @@ fcon(int c) return table[c - 'E']; } -/* 2 Ŀ -> ȯ +/* 2 벌식에서 영문자 -> 중성 변환 * (2 bulsik: conversion english char. to medial vowel) - * : ƴϸ 0 (If it is not medial vowel, return 0). + * 결과: 중성이 아니면 0 (If it is not medial vowel, return 0). */ static int vow(int c) @@ -273,9 +273,9 @@ vow(int c) return table[c - 'O']; } -/* 2Ŀ -> ħ ȯ +/* 2벌식에서 영문자 -> 받침 변환 * (2 bulsik: conversion english char. to prop) - * : ħ ƴϸ 0 (If not prop, return 0) + * 결과: 받침이 아니면 0 (If not prop, return 0) */ static int lcon(int c) @@ -295,7 +295,7 @@ lcon(int c) return table[c - 'R']; } -/* 2 Ŀ ( ħ, Է) -> ħ ȯ +/* 2 벌식에서 (현재 받침, 영문자 입력) -> 받침 변환 * (2 bulsik: conversion (curr. prop, input english) to prop) */ @@ -304,44 +304,44 @@ comcon2(int k, int c) { switch (k) { - case 2: /* */ + case 2: /* ㄱ */ switch (c) { case 't': - return 4; /* */ + return 4; /* ㄱㅅ */ } break; - case 5: /* */ + case 5: /* ㄴ */ switch (c) { - case 'w': /* */ + case 'w': /* ㄴㅈ */ return 6; - case 'g': /* */ + case 'g': /* ㄴㅎ */ return 7; } break; - case 9: /* */ + case 9: /* ㄹ */ switch (c) { - case 'r': /* */ + case 'r': /* ㄹㄱ */ return 10; - case 'a': /* */ + case 'a': /* ㄹㅁ */ return 11; - case 'q': /* */ + case 'q': /* ㄹㅂ */ return 12; - case 't': /* */ + case 't': /* ㄹㅅ */ return 13; - case 'x': /* */ + case 'x': /* ㄹㅌ */ return 14; - case 'v': /* */ + case 'v': /* ㄹㅍ */ return 15; - case 'g': /* */ + case 'g': /* ㄹㅎ */ return 16; } break; - case 19: /* */ + case 19: /* ㅂ */ switch (c) { - case 't': /* */ + case 't': /* ㅂㅅ */ return 20; } break; @@ -349,7 +349,7 @@ comcon2(int k, int c) return 0; } -/* 2Ŀ ( , Է) -> ȯ +/* 2벌식에서 (현재 중성, 영문 입력) -> 중성 변환 * (2 bulsik: conversion (curr. medial vowel, input english) to medial * vowel) */ @@ -359,31 +359,31 @@ comvow2(int v, int c) { switch (v) { - case 13: /* */ + case 13: /* ㅗ */ switch (c) { - case 'k': /* Ǥ */ + case 'k': /* ㅗㅏ */ return 14; - case 'o': /* Ǥ */ + case 'o': /* ㅗㅐ */ return 15; - case 'l': /* Ǥ */ + case 'l': /* ㅗㅣ */ return 18; } break; - case 20: /* */ + case 20: /* ㅜ */ switch (c) { - case 'j': /* ̤ */ + case 'j': /* ㅜㅓ */ return 21; - case 'p': /* ̤ */ + case 'p': /* ㅜㅔ */ return 22; - case 'l': /* ̤ */ + case 'l': /* ㅜㅣ */ return 23; } break; - case 27: /* */ + case 27: /* ㅡ */ switch (c) { - case 'l': /* Ѥ */ + case 'l': /* ㅡㅣ */ return 28; } break; @@ -465,7 +465,7 @@ hangul_automata2(char_u *buf, int_u *c) t = *c; switch (kind_table_for_2(t)) { - case 0: /* (consonant) */ + case 0: /* 자음 (consonant) */ if (f == F_NULL) { if (m != M_NULL) @@ -481,7 +481,7 @@ hangul_automata2(char_u *buf, int_u *c) if (l == L_NULL) { t2 = lcon(t); - if (!t2) /* ħ ʴ (cannot use it as a prop) */ + if (!t2) /* 받침으로 적합하지않다 (cannot use it as a prop) */ { hangul_input_clear(); last_ll = last_l = -1; @@ -498,7 +498,7 @@ hangul_automata2(char_u *buf, int_u *c) push(buf); return AUTOMATA_CORRECT; } - else /* ħ Ͽ code ̴ */ + else /* 받침으로 쓰려하였으나 code에 없는 글자이다 */ { /* cannot find such a prop in the code table */ last_ll = last_l = -1; hangul_input_clear(); @@ -508,7 +508,7 @@ hangul_automata2(char_u *buf, int_u *c) return AUTOMATA_NEW; } } - /* ߾ ִ + /* 초 중 종성이 모두 갖추어져 있다 * I have all the 'initial sound' and 'medial vowel' and 'final * consonant'. */ @@ -573,7 +573,7 @@ hangul_automata2(char_u *buf, int_u *c) sp = 0; if (last_l == -1) { - /* ... ̰ ʿϳ?? (Hmm... Is it needed?) */ + /* 음... 이게 필요하나?? (Hmm... Is it needed?) */ convert_ks_to_3(buf, &f, &m, &l); } else @@ -607,10 +607,10 @@ hangul_automata3(char_u *buf, int_u *c) t = value_table_for_3[*c]; switch (kind_table_for_3[*c]) { - case F_F: /* ʼ (char. of an initial sound) */ + case F_F: /* 초성문자 (char. of an initial sound) */ if (m != M_NULL || sp == 0) { - /* ʼ ų + /* 초성이 비었거나 다음 글자 모으기 시작 * Empty 'initial sound', so starting automata. */ hangul_input_clear(); @@ -619,7 +619,7 @@ hangul_automata3(char_u *buf, int_u *c) push(buf); return AUTOMATA_NEW; } - if ((t2 = comfcon3(f,t)) != 0) /* (double? consonant) */ + if ((t2 = comfcon3(f,t)) != 0) /* 복자음 (double? consonant) */ { f=t2; convert_3_to_code(f, M_NULL, L_NULL, buf); @@ -628,7 +628,7 @@ hangul_automata3(char_u *buf, int_u *c) } return AUTOMATA_ERROR; - case F_M: /* (vowel) */ + case F_M: /* 모음 (vowel) */ if (m == M_NULL) { if (2 != convert_3_to_code(f, t, L_NULL,buf)) @@ -641,7 +641,7 @@ hangul_automata3(char_u *buf, int_u *c) else return AUTOMATA_CORRECT; } - if ((t2 = comvow3(m,t))) /* (a diphthong) */ + if ((t2 = comvow3(m,t))) /* 복모음 (a diphthong) */ { m = t2; convert_3_to_code(f, m, L_NULL, buf); @@ -650,9 +650,9 @@ hangul_automata3(char_u *buf, int_u *c) } return AUTOMATA_ERROR; - case F_L: /* ħ (prop?) */ + case F_L: /* 받침 (prop?) */ if (m == M_NULL) - return AUTOMATA_ERROR; /* */ + return AUTOMATA_ERROR; /* 중성없는 종성 */ if (l == L_NULL) { if (2 != convert_3_to_code(f, m, t, buf)) @@ -664,7 +664,7 @@ hangul_automata3(char_u *buf, int_u *c) l = t; return AUTOMATA_CORRECT; } - if ((t2 = comcon3(l,t)) != 0) /* ħ ?? (double prop?) */ + if ((t2 = comcon3(l,t)) != 0) /* 복 받침 ?? (double prop?) */ { if (2 != convert_3_to_code(f, m, t2, buf)) return AUTOMATA_ERROR; @@ -675,7 +675,7 @@ hangul_automata3(char_u *buf, int_u *c) } return AUTOMATA_ERROR; - case F_A: /* Ưڳ (special char. or number) */ + case F_A: /* 특수문자나 숫자 (special char. or number) */ hangul_input_clear(); *c = t; return AUTOMATA_SPECIAL; @@ -1437,48 +1437,48 @@ static const unsigned short ks_table2[][4] = {0xa4bd, 19, 2, 1}, {0xa4be, 20, 2, 1}, }; -/* ʼ - ϼ ȯ +/* 조합형 초성 - 완성형 낱자 변환 * conversion: initial sound of compound type - ??? of completion type */ static const char_u johab_fcon_to_wan[] = { 0, - 0xd4, 0xa1, 0xa2, 0xa4, 0xa7, /* (ä),,,, */ - 0xa8, 0xa9, 0xb1, 0xb2, 0xb3, /* ,,,, */ - 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, /* ,,,, */ - 0xba, 0xbb, 0xbc, 0xbd, 0xbe /* ,,,, */ + 0xd4, 0xa1, 0xa2, 0xa4, 0xa7, /* (채움),ㄱ,ㄲ,ㄴ,ㄷ */ + 0xa8, 0xa9, 0xb1, 0xb2, 0xb3, /* ㄸ,ㄹ,ㅁ,ㅂ,ㅃ */ + 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, /* ㅅ,ㅆ,ㅇ,ㅈ,ㅉ */ + 0xba, 0xbb, 0xbc, 0xbd, 0xbe /* ㅊ,ㅋ,ㅌ,ㅍ,ㅎ */ }; -/* -> ϼ ȯ +/* 조합형 중성 -> 완성형 낱자 변환 * conversion: medial vowel of compound type - ??? of completion type */ static const char_u johab_vow_to_wan[] = { 0, 0, - 0xd4, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, /* (ä),,,,, */ + 0xd4, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, /* (채움),ㅏ,ㅐ,ㅑ,ㅒ,ㅓ */ 0, 0, - 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, /* ,,,,Ǥ,Ǥ */ + 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, /* ㅔ,ㅕ,ㅖ,ㅗ,ㅗㅏ,ㅗㅐ */ 0, 0, - 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, /* Ǥ,,,̤,̤,̤ */ + 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, /* ㅗㅣ,ㅛ,ㅜ,ㅜㅓ,ㅜㅔ,ㅜㅣ */ 0, 0, - 0xd0, 0xd1, 0xd2, 0xd3 /* ,,Ѥ, */ + 0xd0, 0xd1, 0xd2, 0xd3 /* ㅠ,ㅡ,ㅡㅣ,ㅣ */ }; -/* -> ϼ ȯ +/* 조합형 종성 -> 완성형 낱자 변환 * conversion: final consonant of compound type - ??? of completion type */ static const char_u johab_lcon_to_wan[] = { 0, - 0xd4, 0xa1, 0xa2, 0xa3, 0xa4, /* (ä), , , , */ - 0xa5, 0xa6, 0xa7, 0xa9, 0xaa, /* , , , , */ - 0xab, 0xac, 0xad, 0xae, 0xaf, /* , , , , */ - 0xb0, 0xb1, 0, 0xb2, 0xb4, /* , , 0, , */ - 0xb5, 0xb6, 0xb7, 0xb8, 0xba, /* , , , , */ - 0xbb, 0xbc, 0xbd, 0xbe /* , , , */ + 0xd4, 0xa1, 0xa2, 0xa3, 0xa4, /* (채움), ㄱ, ㄲ, ㄱㅅ, ㄴ */ + 0xa5, 0xa6, 0xa7, 0xa9, 0xaa, /* ㄴㅈ, ㄴㅎ, ㄷ, ㄹ, ㄹㄱ */ + 0xab, 0xac, 0xad, 0xae, 0xaf, /* ㄹㅁ, ㄹㅂ, ㄹㅅ, ㄹㅌ, ㄹㅍ */ + 0xb0, 0xb1, 0, 0xb2, 0xb4, /* ㄹㅎ, ㅁ, 0, ㅂ, ㅂㅅ */ + 0xb5, 0xb6, 0xb7, 0xb8, 0xba, /* ㅅ, ㅆ, ㅇ, ㅈ, ㅊ */ + 0xbb, 0xbc, 0xbd, 0xbe /* ㅋ, ㅌ, ㅍ, ㅎ */ }; static void @@ -1511,7 +1511,7 @@ convert_ks_to_3( *lp = ks_table2[i][3]; return; } - *fp = 0xff; /* ڵ (graphic code) */ + *fp = 0xff; /* 그래픽 코드 (graphic code) */ *mp = h; *lp = low; } @@ -1584,13 +1584,13 @@ convert_3_to_ks( return 2; /* found */ } - /* ϼ ǥ . ``KS C 5601 - 1992 ȯ ȣ ؼ'' - * 3.3 encoding Ѵ. + /* 완성형 표에 없다. ``KS C 5601 - 1992 정보 교환용 부호 해설'' + * 3.3 절에 설명된 방법으로 encoding 한다. */ - *des++ = 0xa4; /* ä */ + *des++ = 0xa4; /* 채움 */ *des++ = 0xd4; - *des++ = 0xa4; /* ڴ a4 ִ. */ + *des++ = 0xa4; /* 낱자는 모두 a4 행에 있다. */ *des++ = johab_fcon_to_wan[fv]; *des++ = 0xa4; *des++ = johab_vow_to_wan[mv]; diff --git a/src/version.c b/src/version.c index 862b3d955..8ae3dda68 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1923, +/**/ 1922, /**/ 1921, |