Merge.

[libsub.git] / src / iso6937_tables.cc

diff --git a/src/iso6937_tables.cc b/src/iso6937_tables.cc
index 07174c4c87637c85ea7fbb26ce9c95b3a1ffd455..0ca02ffa5de5155f2eb214d9c5e11a3d66ecadc2 100644 (file)
--- a/src/iso6937_tables.cc
+++ b/src/iso6937_tables.cc
@@ -38,6 +38,7 @@ map<char, wchar_t> sub::iso6937::double_acute;
 map<char, wchar_t> sub::iso6937::ogonek;
 map<char, wchar_t> sub::iso6937::caron;
 map<char, wchar_t> sub::iso6937::main;
+map<char, map<char, wchar_t> *> sub::iso6937::diacriticals;
 
 void
 sub::make_iso6937_tables ()
@@ -311,6 +312,7 @@ sub::make_iso6937_tables ()
        main[161] = 0x00A1;
        main[162] = 0x00A2;
        main[163] = 0x00A3;
+       main[164] = 0x0024;
        main[165] = 0x00A5;
        main[167] = 0x00A7;
        main[168] = 0x00A4;
@@ -393,4 +395,18 @@ sub::make_iso6937_tables ()
        main[253] = 0x0167;
        main[254] = 0x014B;
        main[255] = 0x00AD;
+
+       diacriticals[0xc1] = &grave;
+       diacriticals[0xc2] = &acute;
+       diacriticals[0xc3] = &circumflex;
+       diacriticals[0xc4] = &tilde;
+       diacriticals[0xc5] = &macron;
+       diacriticals[0xc6] = &breve;
+       diacriticals[0xc7] = &dot;
+       diacriticals[0xc8] = &diaeresis;
+       diacriticals[0xca] = &ring;
+       diacriticals[0xcb] = &cedilla;
+       diacriticals[0xcd] = &double_acute;
+       diacriticals[0xce] = &ogonek;
+       diacriticals[0xcf] = &caron;
 }