ansi_x3_4_1968.h   ansi_x3_4_1968.h 
skipping to change at line 52 skipping to change at line 52
const cet_ucs4_link_t cet_ucs4_to_ansi_x3_4_1968_links[cet_ucs4_to_ansi_x3_ 4_1968_ct]; const cet_ucs4_link_t cet_ucs4_to_ansi_x3_4_1968_links[cet_ucs4_to_ansi_x3_ 4_1968_ct];
// #define cet_ucs4_to_ansi_x3_4_1968_extra_ct 200 // #define cet_ucs4_to_ansi_x3_4_1968_extra_ct 200
const cet_ucs4_link_t cet_ucs4_to_ansi_x3_4_1968_extra[] = const cet_ucs4_link_t cet_ucs4_to_ansi_x3_4_1968_extra[] =
/* ------------------------------------------*/ /* ------------------------------------------*/
/* !!! sorted by UCS-4 value !!! */ /* !!! sorted by UCS-4 value !!! */
/* ------------------------------------------*/ /* ------------------------------------------*/
{ {
{0x00c0, (unsigned char) 'A'}, // latin capital letter a with grave {0x00C0, (unsigned char) 'A'}, // latin capital letter a with grave
{0x00c1, (unsigned char) 'A'}, // latin capital letter a with acute {0x00C1, (unsigned char) 'A'}, // latin capital letter a with acute
{0x00C2, (unsigned char) 'A'}, // latin capital letter a with circumflex {0x00C2, (unsigned char) 'A'}, // latin capital letter a with circum
{0x00C3, (unsigned char) 'A'}, // latin capital letter a with tilde flex
{0x00C4, (unsigned char) 'A'}, // latin capital letter a with diaeresis {0x00C3, (unsigned char) 'A'}, // latin capital letter a with tilde
{0x00C5, (unsigned char) 'A'}, // latin capital letter a with ring above {0x00C4, (unsigned char) 'A'}, // latin capital letter a with diaere
{0x00C7, (unsigned char) 'C'}, // latin capital letter c with cedilla sis
{0x00C8, (unsigned char) 'E'}, // latin capital letter e with grave {0x00C5, (unsigned char) 'A'}, // latin capital letter a with ring a
{0x00C9, (unsigned char) 'E'}, // latin capital letter e with acute bove
{0x00CA, (unsigned char) 'E'}, // latin capital letter e with circumflex {0x00C7, (unsigned char) 'C'}, // latin capital letter c with cedill
{0x00CB, (unsigned char) 'E'}, // latin capital letter e with diaeresis a
{0x00CC, (unsigned char) 'I'}, // latin capital letter i with grave {0x00C8, (unsigned char) 'E'}, // latin capital letter e with grave
{0x00CD, (unsigned char) 'I'}, // latin capital letter i with acute {0x00C9, (unsigned char) 'E'}, // latin capital letter e with acute
{0x00CE, (unsigned char) 'I'}, // latin capital letter i with circumflex {0x00CA, (unsigned char) 'E'}, // latin capital letter e with circum
{0x00CF, (unsigned char) 'I'}, // latin capital letter i with diaeresis flex
{0x00D1, (unsigned char) 'N'}, // latin capital letter n with tilde {0x00CB, (unsigned char) 'E'}, // latin capital letter e with diaere
{0x00D2, (unsigned char) 'O'}, // latin capital letter o with grave sis
{0x00D3, (unsigned char) 'O'}, // latin capital letter o with acute {0x00CC, (unsigned char) 'I'}, // latin capital letter i with grave
{0x00D4, (unsigned char) 'O'}, // latin capital letter o with circumflex {0x00CD, (unsigned char) 'I'}, // latin capital letter i with acute
{0x00D5, (unsigned char) 'O'}, // latin capital letter o with tilde {0x00CE, (unsigned char) 'I'}, // latin capital letter i with circum
{0x00D6, (unsigned char) 'O'}, // latin capital letter o with diaeresis flex
{0x00D8, (unsigned char) 'O'}, // latin capital letter o with stroke {0x00CF, (unsigned char) 'I'}, // latin capital letter i with diaere
{0x00D9, (unsigned char) 'U'}, // latin capital letter u with grave sis
{0x00DA, (unsigned char) 'U'}, // latin capital letter u with acute {0x00D1, (unsigned char) 'N'}, // latin capital letter n with tilde
{0x00DB, (unsigned char) 'U'}, // latin capital letter u with circumflex {0x00D2, (unsigned char) 'O'}, // latin capital letter o with grave
{0x00DC, (unsigned char) 'U'}, // latin capital letter u with diaeresis {0x00D3, (unsigned char) 'O'}, // latin capital letter o with acute
{0x00DD, (unsigned char) 'Y'}, // latin capital letter y with acute {0x00D4, (unsigned char) 'O'}, // latin capital letter o with circum
{0x00E0, (unsigned char) 'a'}, // latin small letter a with grave flex
{0x00E1, (unsigned char) 'a'}, // latin small letter a with acute {0x00D5, (unsigned char) 'O'}, // latin capital letter o with tilde
{0x00E2, (unsigned char) 'a'}, // latin small letter a with circumflex {0x00D6, (unsigned char) 'O'}, // latin capital letter o with diaere
{0x00E3, (unsigned char) 'a'}, // latin small letter a with tilde sis
{0x00E4, (unsigned char) 'a'}, // latin small letter a with diaeresis {0x00D8, (unsigned char) 'O'}, // latin capital letter o with stroke
{0x00E5, (unsigned char) 'a'}, // latin small letter a with ring above {0x00D9, (unsigned char) 'U'}, // latin capital letter u with grave
{0x00E7, (unsigned char) 'c'}, // latin small letter c with cedilla {0x00DA, (unsigned char) 'U'}, // latin capital letter u with acute
{0x00E8, (unsigned char) 'e'}, // latin small letter e with grave {0x00DB, (unsigned char) 'U'}, // latin capital letter u with circum
{0x00E9, (unsigned char) 'e'}, // latin small letter e with acute flex
{0x00EA, (unsigned char) 'e'}, // latin small letter e with circumflex {0x00DC, (unsigned char) 'U'}, // latin capital letter u with diaere
{0x00EB, (unsigned char) 'e'}, // latin small letter e with diaeresis sis
{0x00EC, (unsigned char) 'i'}, // latin small letter i with grave {0x00DD, (unsigned char) 'Y'}, // latin capital letter y with acute
{0x00ED, (unsigned char) 'i'}, // latin small letter i with acute {0x00E0, (unsigned char) 'a'}, // latin small letter a with grave
{0x00EE, (unsigned char) 'i'}, // latin small letter i with circumflex {0x00E1, (unsigned char) 'a'}, // latin small letter a with acute
{0x00EF, (unsigned char) 'i'}, // latin small letter i with diaeresis {0x00E2, (unsigned char) 'a'}, // latin small letter a with circumfl
{0x00F1, (unsigned char) 'n'}, // latin small letter n with tilde ex
{0x00F2, (unsigned char) 'o'}, // latin small letter o with grave {0x00E3, (unsigned char) 'a'}, // latin small letter a with tilde
{0x00F3, (unsigned char) 'o'}, // latin small letter o with acute {0x00E4, (unsigned char) 'a'}, // latin small letter a with diaeresi
{0x00F4, (unsigned char) 'o'}, // latin small letter o with circumflex s
{0x00F5, (unsigned char) 'o'}, // latin small letter o with tilde {0x00E5, (unsigned char) 'a'}, // latin small letter a with ring abo
{0x00F6, (unsigned char) 'o'}, // latin small letter o with diaeresis ve
{0x00F8, (unsigned char) 'o'}, // latin small letter o with stroke {0x00E7, (unsigned char) 'c'}, // latin small letter c with cedilla
{0x00F9, (unsigned char) 'u'}, // latin small letter u with grave {0x00E8, (unsigned char) 'e'}, // latin small letter e with grave
{0x00FA, (unsigned char) 'u'}, // latin small letter u with acute {0x00E9, (unsigned char) 'e'}, // latin small letter e with acute
{0x00FB, (unsigned char) 'u'}, // latin small letter u with circumflex {0x00EA, (unsigned char) 'e'}, // latin small letter e with circumfl
{0x00FC, (unsigned char) 'u'}, // latin small letter u with diaeresis ex
{0x00FD, (unsigned char) 'y'}, // latin small letter y with acute {0x00EB, (unsigned char) 'e'}, // latin small letter e with diaeresi
{0x00FF, (unsigned char) 'y'}, // latin small letter y with diaeresis s
{0x0100, (unsigned char) 'A'}, // latin capital letter a with macron {0x00EC, (unsigned char) 'i'}, // latin small letter i with grave
{0x0101, (unsigned char) 'a'}, // latin small letter a with macron {0x00ED, (unsigned char) 'i'}, // latin small letter i with acute
{0x0102, (unsigned char) 'A'}, // latin capital letter a with breve {0x00EE, (unsigned char) 'i'}, // latin small letter i with circumfl
{0x0103, (unsigned char) 'a'}, // latin small letter a with breve ex
{0x0104, (unsigned char) 'A'}, // latin capital letter a with ogonek {0x00EF, (unsigned char) 'i'}, // latin small letter i with diaeresi
{0x0105, (unsigned char) 'a'}, // latin small letter a with ogonek s
{0x0106, (unsigned char) 'C'}, // latin capital letter c with acute {0x00F1, (unsigned char) 'n'}, // latin small letter n with tilde
{0x0107, (unsigned char) 'c'}, // latin small letter c with acute {0x00F2, (unsigned char) 'o'}, // latin small letter o with grave
{0x0108, (unsigned char) 'C'}, // latin capital letter c with circumflex {0x00F3, (unsigned char) 'o'}, // latin small letter o with acute
{0x0109, (unsigned char) 'c'}, // latin small letter c with circumflex {0x00F4, (unsigned char) 'o'}, // latin small letter o with circumfl
{0x010A, (unsigned char) 'C'}, // latin capital letter c with dot above ex
{0x010B, (unsigned char) 'c'}, // latin small letter c with dot above {0x00F5, (unsigned char) 'o'}, // latin small letter o with tilde
{0x010C, (unsigned char) 'C'}, // latin capital letter c with caron {0x00F6, (unsigned char) 'o'}, // latin small letter o with diaeresi
{0x010D, (unsigned char) 'c'}, // latin small letter c with caron s
{0x010E, (unsigned char) 'D'}, // latin capital letter d with caron {0x00F8, (unsigned char) 'o'}, // latin small letter o with stroke
{0x010F, (unsigned char) 'd'}, // latin small letter d with caron {0x00F9, (unsigned char) 'u'}, // latin small letter u with grave
{0x0110, (unsigned char) 'D'}, // latin capital letter d with stroke {0x00FA, (unsigned char) 'u'}, // latin small letter u with acute
{0x0111, (unsigned char) 'd'}, // latin small letter d with stroke {0x00FB, (unsigned char) 'u'}, // latin small letter u with circumfl
{0x0112, (unsigned char) 'E'}, // latin capital letter e with macron ex
{0x0113, (unsigned char) 'e'}, // latin small letter e with macron {0x00FC, (unsigned char) 'u'}, // latin small letter u with diaeresi
{0x0116, (unsigned char) 'E'}, // latin capital letter e with dot above s
{0x0117, (unsigned char) 'e'}, // latin small letter e with dot above {0x00FD, (unsigned char) 'y'}, // latin small letter y with acute
{0x0118, (unsigned char) 'E'}, // latin capital letter e with ogonek {0x00FF, (unsigned char) 'y'}, // latin small letter y with diaeresi
{0x0119, (unsigned char) 'e'}, // latin small letter e with ogonek s
{0x011A, (unsigned char) 'E'}, // latin capital letter e with caron {0x0100, (unsigned char) 'A'}, // latin capital letter a with macron
{0x011B, (unsigned char) 'e'}, // latin small letter e with caron {0x0101, (unsigned char) 'a'}, // latin small letter a with macron
{0x011C, (unsigned char) 'G'}, // latin capital letter g with circumflex {0x0102, (unsigned char) 'A'}, // latin capital letter a with breve
{0x011D, (unsigned char) 'g'}, // latin small letter g with circumflex {0x0103, (unsigned char) 'a'}, // latin small letter a with breve
{0x011E, (unsigned char) 'G'}, // latin capital letter g with breve {0x0104, (unsigned char) 'A'}, // latin capital letter a with ogonek
{0x011F, (unsigned char) 'g'}, // latin small letter g with breve {0x0105, (unsigned char) 'a'}, // latin small letter a with ogonek
{0x0120, (unsigned char) 'G'}, // latin capital letter g with dot above {0x0106, (unsigned char) 'C'}, // latin capital letter c with acute
{0x0121, (unsigned char) 'g'}, // latin small letter g with dot above {0x0107, (unsigned char) 'c'}, // latin small letter c with acute
{0x0122, (unsigned char) 'G'}, // latin capital letter g with cedilla {0x0108, (unsigned char) 'C'}, // latin capital letter c with circum
{0x0123, (unsigned char) 'g'}, // latin small letter g with cedilla flex
{0x0124, (unsigned char) 'H'}, // latin capital letter h with circumflex {0x0109, (unsigned char) 'c'}, // latin small letter c with circumfl
{0x0125, (unsigned char) 'h'}, // latin small letter h with circumflex ex
{0x0126, (unsigned char) 'H'}, // latin capital letter h with stroke {0x010A, (unsigned char) 'C'}, // latin capital letter c with dot ab
{0x0127, (unsigned char) 'h'}, // latin small letter h with stroke ove
{0x0128, (unsigned char) 'I'}, // latin capital letter i with tilde {0x010B, (unsigned char) 'c'}, // latin small letter c with dot abov
{0x0129, (unsigned char) 'i'}, // latin small letter i with tilde e
{0x012A, (unsigned char) 'I'}, // latin capital letter i with macron {0x010C, (unsigned char) 'C'}, // latin capital letter c with caron
{0x012B, (unsigned char) 'i'}, // latin small letter i with macron {0x010D, (unsigned char) 'c'}, // latin small letter c with caron
{0x012E, (unsigned char) 'I'}, // latin capital letter i with ogonek {0x010E, (unsigned char) 'D'}, // latin capital letter d with caron
{0x012F, (unsigned char) 'i'}, // latin small letter i with ogonek {0x010F, (unsigned char) 'd'}, // latin small letter d with caron
{0x0130, (unsigned char) 'I'}, // latin capital letter i with dot above {0x0110, (unsigned char) 'D'}, // latin capital letter d with stroke
{0x0134, (unsigned char) 'J'}, // latin capital letter j with circumflex {0x0111, (unsigned char) 'd'}, // latin small letter d with stroke
{0x0135, (unsigned char) 'j'}, // latin small letter j with circumflex {0x0112, (unsigned char) 'E'}, // latin capital letter e with macron
{0x0136, (unsigned char) 'K'}, // latin capital letter k with cedilla {0x0113, (unsigned char) 'e'}, // latin small letter e with macron
{0x0137, (unsigned char) 'k'}, // latin small letter k with cedilla {0x0114, (unsigned char) 'E'}, // latin capital letter e with breve
{0x0139, (unsigned char) 'L'}, // latin capital letter l with acute {0x0115, (unsigned char) 'e'}, // latin small letter e with breve
{0x013A, (unsigned char) 'l'}, // latin small letter l with acute {0x0116, (unsigned char) 'E'}, // latin capital letter e with dot ab
{0x013B, (unsigned char) 'L'}, // latin capital letter l with cedilla ove
{0x013C, (unsigned char) 'l'}, // latin small letter l with cedilla {0x0117, (unsigned char) 'e'}, // latin small letter e with dot abov
{0x013D, (unsigned char) 'L'}, // latin capital letter l with caron e
{0x013E, (unsigned char) 'l'}, // latin small letter l with caron {0x0118, (unsigned char) 'E'}, // latin capital letter e with ogonek
{0x0141, (unsigned char) 'L'}, // latin capital letter l with stroke {0x0119, (unsigned char) 'e'}, // latin small letter e with ogonek
{0x0142, (unsigned char) 'l'}, // latin small letter l with stroke {0x011A, (unsigned char) 'E'}, // latin capital letter e with caron
{0x0143, (unsigned char) 'N'}, // latin capital letter n with acute {0x011B, (unsigned char) 'e'}, // latin small letter e with caron
{0x0144, (unsigned char) 'n'}, // latin small letter n with acute {0x011C, (unsigned char) 'G'}, // latin capital letter g with circum
{0x0145, (unsigned char) 'N'}, // latin capital letter n with cedilla flex
{0x0146, (unsigned char) 'n'}, // latin small letter n with cedilla {0x011D, (unsigned char) 'g'}, // latin small letter g with circumfl
{0x0147, (unsigned char) 'N'}, // latin capital letter n with caron ex
{0x0148, (unsigned char) 'n'}, // latin small letter n with caron {0x011E, (unsigned char) 'G'}, // latin capital letter g with breve
{0x014C, (unsigned char) 'O'}, // latin capital letter o with macron {0x011F, (unsigned char) 'g'}, // latin small letter g with breve
{0x014D, (unsigned char) 'o'}, // latin small letter o with macron {0x0120, (unsigned char) 'G'}, // latin capital letter g with dot ab
{0x0150, (unsigned char) 'O'}, // latin capital letter o with double acut ove
e {0x0121, (unsigned char) 'g'}, // latin small letter g with dot abov
{0x0151, (unsigned char) 'o'}, // latin small letter o with double acute e
{0x0154, (unsigned char) 'R'}, // latin capital letter r with acute {0x0122, (unsigned char) 'G'}, // latin capital letter g with cedill
{0x0155, (unsigned char) 'r'}, // latin small letter r with acute a
{0x0156, (unsigned char) 'R'}, // latin capital letter r with cedilla {0x0123, (unsigned char) 'g'}, // latin small letter g with cedilla
{0x0157, (unsigned char) 'r'}, // latin small letter r with cedilla {0x0124, (unsigned char) 'H'}, // latin capital letter h with circum
{0x0158, (unsigned char) 'R'}, // latin capital letter r with caron flex
{0x0159, (unsigned char) 'r'}, // latin small letter r with caron {0x0125, (unsigned char) 'h'}, // latin small letter h with circumfl
{0x015A, (unsigned char) 'S'}, // latin capital letter s with acute ex
{0x015B, (unsigned char) 's'}, // latin small letter s with acute {0x0126, (unsigned char) 'H'}, // latin capital letter h with stroke
{0x015C, (unsigned char) 'S'}, // latin capital letter s with circumflex {0x0127, (unsigned char) 'h'}, // latin small letter h with stroke
{0x015D, (unsigned char) 's'}, // latin small letter s with circumflex {0x0128, (unsigned char) 'I'}, // latin capital letter i with tilde
{0x015E, (unsigned char) 'S'}, // latin capital letter s with cedilla {0x0129, (unsigned char) 'i'}, // latin small letter i with tilde
{0x015F, (unsigned char) 's'}, // latin small letter s with cedilla {0x012A, (unsigned char) 'I'}, // latin capital letter i with macron
{0x0160, (unsigned char) 'S'}, // latin capital letter s with caron {0x012B, (unsigned char) 'i'}, // latin small letter i with macron
{0x0161, (unsigned char) 's'}, // latin small letter s with caron {0x012C, (unsigned char) 'I'}, // latin capital letter i with breve
{0x0162, (unsigned char) 'T'}, // latin capital letter t with cedilla {0x012D, (unsigned char) 'i'}, // latin small letter i with breve
{0x0163, (unsigned char) 't'}, // latin small letter t with cedilla {0x012E, (unsigned char) 'I'}, // latin capital letter i with ogonek
{0x0164, (unsigned char) 'T'}, // latin capital letter t with caron {0x012F, (unsigned char) 'i'}, // latin small letter i with ogonek
{0x0165, (unsigned char) 't'}, // latin small letter t with caron {0x0130, (unsigned char) 'I'}, // latin capital letter i with dot ab
{0x0166, (unsigned char) 'T'}, // latin capital letter t with stroke ove
{0x0167, (unsigned char) 't'}, // latin small letter t with stroke {0x0131, (unsigned char) 'i'}, // latin small letter dotless i
{0x0168, (unsigned char) 'U'}, // latin capital letter u with tilde {0x0134, (unsigned char) 'J'}, // latin capital letter j with circum
{0x0169, (unsigned char) 'u'}, // latin small letter u with tilde flex
{0x016A, (unsigned char) 'U'}, // latin capital letter u with macron {0x0135, (unsigned char) 'j'}, // latin small letter j with circumfl
{0x016B, (unsigned char) 'u'}, // latin small letter u with macron ex
{0x016C, (unsigned char) 'U'}, // latin capital letter u with breve {0x0136, (unsigned char) 'K'}, // latin capital letter k with cedill
{0x016D, (unsigned char) 'u'}, // latin small letter u with breve a
{0x016E, (unsigned char) 'U'}, // latin capital letter u with ring above {0x0137, (unsigned char) 'k'}, // latin small letter k with cedilla
{0x016F, (unsigned char) 'u'}, // latin small letter u with ring above {0x0139, (unsigned char) 'L'}, // latin capital letter l with acute
{0x0170, (unsigned char) 'U'}, // latin capital letter u with double acut {0x013A, (unsigned char) 'l'}, // latin small letter l with acute
e {0x013B, (unsigned char) 'L'}, // latin capital letter l with cedill
{0x0171, (unsigned char) 'u'}, // latin small letter u with double acute a
{0x0172, (unsigned char) 'U'}, // latin capital letter u with ogonek {0x013C, (unsigned char) 'l'}, // latin small letter l with cedilla
{0x0173, (unsigned char) 'u'}, // latin small letter u with ogonek {0x013D, (unsigned char) 'L'}, // latin capital letter l with caron
{0x0174, (unsigned char) 'W'}, // latin capital letter w with circumflex {0x013E, (unsigned char) 'l'}, // latin small letter l with caron
{0x0175, (unsigned char) 'w'}, // latin small letter w with circumflex {0x0141, (unsigned char) 'L'}, // latin capital letter l with stroke
{0x0176, (unsigned char) 'Y'}, // latin capital letter y with circumflex {0x0142, (unsigned char) 'l'}, // latin small letter l with stroke
{0x0177, (unsigned char) 'y'}, // latin small letter y with circumflex {0x0143, (unsigned char) 'N'}, // latin capital letter n with acute
{0x0178, (unsigned char) 'Y'}, // latin capital letter y with diaeresis {0x0144, (unsigned char) 'n'}, // latin small letter n with acute
{0x0179, (unsigned char) 'Z'}, // latin capital letter z with acute {0x0145, (unsigned char) 'N'}, // latin capital letter n with cedill
{0x017A, (unsigned char) 'z'}, // latin small letter z with acute a
{0x017B, (unsigned char) 'Z'}, // latin capital letter z with dot above {0x0146, (unsigned char) 'n'}, // latin small letter n with cedilla
{0x017C, (unsigned char) 'z'}, // latin small letter z with dot above {0x0147, (unsigned char) 'N'}, // latin capital letter n with caron
{0x017D, (unsigned char) 'Z'}, // latin capital letter z with caron {0x0148, (unsigned char) 'n'}, // latin small letter n with caron
{0x017E, (unsigned char) 'z'}, // latin small letter z with caron {0x014C, (unsigned char) 'O'}, // latin capital letter o with macron
{0x1E02, (unsigned char) 'B'}, // latin capital letter b with dot above {0x014D, (unsigned char) 'o'}, // latin small letter o with macron
{0x1E03, (unsigned char) 'b'}, // latin small letter b with dot above {0x014E, (unsigned char) 'O'}, // latin capital letter o with breve
{0x1E0A, (unsigned char) 'D'}, // latin capital letter d with dot above {0x014F, (unsigned char) 'o'}, // latin small letter o with breve
{0x1E0B, (unsigned char) 'd'}, // latin small letter d with dot above {0x0150, (unsigned char) 'O'}, // latin capital letter o with double
{0x1E1E, (unsigned char) 'F'}, // latin capital letter f with dot above acute
{0x1E1F, (unsigned char) 'f'}, // latin small letter f with dot above {0x0151, (unsigned char) 'o'}, // latin small letter o with double a
{0x1E40, (unsigned char) 'M'}, // latin capital letter m with dot above cute
{0x1E41, (unsigned char) 'm'}, // latin small letter m with dot above {0x0152, (unsigned char) 'O'}, // latin capital ligature oe
{0x1E56, (unsigned char) 'P'}, // latin capital letter p with dot above {0x0153, (unsigned char) 'o'}, // latin small ligature oe
{0x1E57, (unsigned char) 'p'}, // latin small letter p with dot above {0x0154, (unsigned char) 'R'}, // latin capital letter r with acute
{0x1E60, (unsigned char) 'S'}, // latin capital letter s with dot above {0x0155, (unsigned char) 'r'}, // latin small letter r with acute
{0x1E61, (unsigned char) 's'}, // latin small letter s with dot above {0x0156, (unsigned char) 'R'}, // latin capital letter r with cedill
{0x1E6A, (unsigned char) 'T'}, // latin capital letter t with dot above a
{0x1E6B, (unsigned char) 't'}, // latin small letter t with dot above {0x0157, (unsigned char) 'r'}, // latin small letter r with cedilla
{0x1E80, (unsigned char) 'W'}, // latin capital letter w with grave {0x0158, (unsigned char) 'R'}, // latin capital letter r with caron
{0x1E81, (unsigned char) 'w'}, // latin small letter w with grave {0x0159, (unsigned char) 'r'}, // latin small letter r with caron
{0x1E82, (unsigned char) 'W'}, // latin capital letter w with acute {0x015A, (unsigned char) 'S'}, // latin capital letter s with acute
{0x1E83, (unsigned char) 'w'}, // latin small letter w with acute {0x015B, (unsigned char) 's'}, // latin small letter s with acute
{0x1E84, (unsigned char) 'W'}, // latin capital letter w with diaeresis {0x015C, (unsigned char) 'S'}, // latin capital letter s with circum
{0x1E85, (unsigned char) 'w'}, // latin small letter w with diaeresis flex
{0x1e94, (unsigned char) 'u'}, {0x015D, (unsigned char) 's'}, // latin small letter s with circumfl
{0x1EF2, (unsigned char) 'Y'}, // latin capital letter y with grave ex
{0x1EF3, (unsigned char) 'y'}, // latin small letter y with grave {0x015E, (unsigned char) 'S'}, // latin capital letter s with cedill
{0x201c, (unsigned char) '"'}, a
{0x201d, (unsigned char) '"'} {0x015F, (unsigned char) 's'}, // latin small letter s with cedilla
{0x0160, (unsigned char) 'S'}, // latin capital letter s with caron
{0x0161, (unsigned char) 's'}, // latin small letter s with caron
{0x0162, (unsigned char) 'T'}, // latin capital letter t with cedill
a
{0x0163, (unsigned char) 't'}, // latin small letter t with cedilla
{0x0164, (unsigned char) 'T'}, // latin capital letter t with caron
{0x0165, (unsigned char) 't'}, // latin small letter t with caron
{0x0166, (unsigned char) 'T'}, // latin capital letter t with stroke
{0x0167, (unsigned char) 't'}, // latin small letter t with stroke
{0x0168, (unsigned char) 'U'}, // latin capital letter u with tilde
{0x0169, (unsigned char) 'u'}, // latin small letter u with tilde
{0x016A, (unsigned char) 'U'}, // latin capital letter u with macron
{0x016B, (unsigned char) 'u'}, // latin small letter u with macron
{0x016C, (unsigned char) 'U'}, // latin capital letter u with breve
{0x016D, (unsigned char) 'u'}, // latin small letter u with breve
{0x016E, (unsigned char) 'U'}, // latin capital letter u with ring a
bove
{0x016F, (unsigned char) 'u'}, // latin small letter u with ring abo
ve
{0x0170, (unsigned char) 'U'}, // latin capital letter u with double
acute
{0x0171, (unsigned char) 'u'}, // latin small letter u with double a
cute
{0x0172, (unsigned char) 'U'}, // latin capital letter u with ogonek
{0x0173, (unsigned char) 'u'}, // latin small letter u with ogonek
{0x0174, (unsigned char) 'W'}, // latin capital letter w with circum
flex
{0x0175, (unsigned char) 'w'}, // latin small letter w with circumfl
ex
{0x0176, (unsigned char) 'Y'}, // latin capital letter y with circum
flex
{0x0177, (unsigned char) 'y'}, // latin small letter y with circumfl
ex
{0x0178, (unsigned char) 'Y'}, // latin capital letter y with diaere
sis
{0x0179, (unsigned char) 'Z'}, // latin capital letter z with acute
{0x017A, (unsigned char) 'z'}, // latin small letter z with acute
{0x017B, (unsigned char) 'Z'}, // latin capital letter z with dot ab
ove
{0x017C, (unsigned char) 'z'}, // latin small letter z with dot abov
e
{0x017D, (unsigned char) 'Z'}, // latin capital letter z with caron
{0x017E, (unsigned char) 'z'}, // latin small letter z with caron
{0x0180, (unsigned char) 'b'}, // latin small letter b with stroke
{0x0189, (unsigned char) 'D'}, // latin capital letter african d
{0x0191, (unsigned char) 'F'}, // latin capital letter f with hook
{0x0192, (unsigned char) 'f'}, // latin small letter f with hook
{0x0197, (unsigned char) 'I'}, // latin capital letter i with stroke
{0x019A, (unsigned char) 'l'}, // latin small letter l with bar
{0x019F, (unsigned char) 'O'}, // latin capital letter o with middle
tilde
{0x01A0, (unsigned char) 'O'}, // latin capital letter o with horn
{0x01A1, (unsigned char) 'o'}, // latin small letter o with horn
{0x01AB, (unsigned char) 't'}, // latin small letter t with palatal
hook
{0x01AE, (unsigned char) 'T'}, // latin capital letter t with retrof
lex hook
{0x01AF, (unsigned char) 'U'}, // latin capital letter u with horn
{0x01B0, (unsigned char) 'u'}, // latin small letter u with horn
{0x01B6, (unsigned char) 'z'}, // latin small letter z with stroke
{0x01C0, (unsigned char) '|'}, // latin letter dental click
{0x01C3, (unsigned char) '!'}, // latin letter retroflex click
{0x01CD, (unsigned char) 'A'}, // latin capital letter a with caron
{0x01CE, (unsigned char) 'a'}, // latin small letter a with caron
{0x01CF, (unsigned char) 'I'}, // latin capital letter i with caron
{0x01D0, (unsigned char) 'i'}, // latin small letter i with caron
{0x01D1, (unsigned char) 'O'}, // latin capital letter o with caron
{0x01D2, (unsigned char) 'o'}, // latin small letter o with caron
{0x01D3, (unsigned char) 'U'}, // latin capital letter u with caron
{0x01D4, (unsigned char) 'u'}, // latin small letter u with caron
{0x01D5, (unsigned char) 'U'}, // latin capital letter u with diaere
sis and macron
{0x01D6, (unsigned char) 'u'}, // latin small letter u with diaeresi
s and macron
{0x01D7, (unsigned char) 'U'}, // latin capital letter u with diaere
sis and acute
{0x01D8, (unsigned char) 'u'}, // latin small letter u with diaeresi
s and acute
{0x01D9, (unsigned char) 'U'}, // latin capital letter u with diaere
sis and caron
{0x01DA, (unsigned char) 'u'}, // latin small letter u with diaeresi
s and caron
{0x01DB, (unsigned char) 'U'}, // latin capital letter u with diaere
sis and grave
{0x01DC, (unsigned char) 'u'}, // latin small letter u with diaeresi
s and grave
{0x01DE, (unsigned char) 'A'}, // latin capital letter a with diaere
sis and macron
{0x01DF, (unsigned char) 'a'}, // latin small letter a with diaeresi
s and macron
{0x01E4, (unsigned char) 'G'}, // latin capital letter g with stroke
{0x01E5, (unsigned char) 'g'}, // latin small letter g with stroke
{0x01E6, (unsigned char) 'G'}, // latin capital letter g with caron
{0x01E7, (unsigned char) 'g'}, // latin small letter g with caron
{0x01E8, (unsigned char) 'K'}, // latin capital letter k with caron
{0x01E9, (unsigned char) 'k'}, // latin small letter k with caron
{0x01EA, (unsigned char) 'O'}, // latin capital letter o with ogonek
{0x01EB, (unsigned char) 'o'}, // latin small letter o with ogonek
{0x01EC, (unsigned char) 'O'}, // latin capital letter o with ogonek
and macron
{0x01ED, (unsigned char) 'o'}, // latin small letter o with ogonek a
nd macron
{0x01F0, (unsigned char) 'j'}, // latin small letter j with caron
{0x0261, (unsigned char) 'g'}, // latin small letter script g
{0x02B9, (unsigned char) '\''}, // modifier letter prime
{0x02BA, (unsigned char) '"'}, // modifier letter double prime
{0x02BC, (unsigned char) '\''}, // modifier letter apostrophe
{0x02C4, (unsigned char) '^'}, // modifier letter up arrowhead
{0x02C6, (unsigned char) '^'}, // modifier letter circumflex accent
{0x02C7, (unsigned char) '^'}, // caron
{0x02C8, (unsigned char) '\''}, // modifier letter vertical line
{0x02CB, (unsigned char) '`'}, // modifier letter grave accent
{0x02CD, (unsigned char) '_'}, // modifier letter low macron
{0x02D8, (unsigned char) '^'}, // circumflex accent
{0x02D9, (unsigned char) '\''}, // dot above
{0x02DC, (unsigned char) '~'}, // small tilde
{0x0300, (unsigned char) '`'}, // combining grave accent
{0x0302, (unsigned char) '^'}, // combining circumflex accent
{0x0303, (unsigned char) '~'}, // combining tilde
{0x030E, (unsigned char) '"'}, // combining double vertical line abo
ve
{0x0331, (unsigned char) '_'}, // combining macron below
{0x0332, (unsigned char) '_'}, // combining low line
{0x037E, (unsigned char) ';'}, // greek question mark
{0x0393, (unsigned char) 'G'}, // greek capital letter gamma
{0x0398, (unsigned char) 'T'}, // greek capital letter theta
{0x03A3, (unsigned char) 'S'}, // greek capital letter sigma
{0x03A6, (unsigned char) 'F'}, // greek capital letter phi
{0x03A9, (unsigned char) 'O'}, // greek capital letter omega
{0x03B1, (unsigned char) 'a'}, // greek small letter alpha
{0x03B4, (unsigned char) 'd'}, // greek small letter delta
{0x03B5, (unsigned char) 'e'}, // greek small letter epsilon
{0x03C0, (unsigned char) 'p'}, // greek small letter pi
{0x03C3, (unsigned char) 's'}, // greek small letter sigma
{0x03C4, (unsigned char) 't'}, // greek small letter tau
{0x03C6, (unsigned char) 'f'}, // greek small letter phi
{0x04BB, (unsigned char) 'h'}, // cyrillic small letter shha
{0x0589, (unsigned char) ':'}, // armenian full stop
{0x066A, (unsigned char) '%'}, // arabic percent sign
{0x1E02, (unsigned char) 'B'}, // latin capital letter b with dot ab
ove
{0x1E03, (unsigned char) 'b'}, // latin small letter b with dot abov
e
{0x1E0A, (unsigned char) 'D'}, // latin capital letter d with dot ab
ove
{0x1E0B, (unsigned char) 'd'}, // latin small letter d with dot abov
e
{0x1E1E, (unsigned char) 'F'}, // latin capital letter f with dot ab
ove
{0x1E1F, (unsigned char) 'f'}, // latin small letter f with dot abov
e
{0x1E40, (unsigned char) 'M'}, // latin capital letter m with dot ab
ove
{0x1E41, (unsigned char) 'm'}, // latin small letter m with dot abov
e
{0x1E56, (unsigned char) 'P'}, // latin capital letter p with dot ab
ove
{0x1E57, (unsigned char) 'p'}, // latin small letter p with dot abov
e
{0x1E60, (unsigned char) 'S'}, // latin capital letter s with dot ab
ove
{0x1E61, (unsigned char) 's'}, // latin small letter s with dot abov
e
{0x1E6A, (unsigned char) 'T'}, // latin capital letter t with dot ab
ove
{0x1E6B, (unsigned char) 't'}, // latin small letter t with dot abov
e
{0x1E80, (unsigned char) 'W'}, // latin capital letter w with grave
{0x1E81, (unsigned char) 'w'}, // latin small letter w with grave
{0x1E82, (unsigned char) 'W'}, // latin capital letter w with acute
{0x1E83, (unsigned char) 'w'}, // latin small letter w with acute
{0x1E84, (unsigned char) 'W'}, // latin capital letter w with diaere
sis
{0x1E85, (unsigned char) 'w'}, // latin small letter w with diaeresi
s
{0x1E94, (unsigned char) 'u'},
{0x1EF2, (unsigned char) 'Y'}, // latin capital letter y with grave
{0x1EF3, (unsigned char) 'y'}, // latin small letter y with grave
{0x2000, (unsigned char) ' '}, // en quad
{0x2001, (unsigned char) ' '}, // em quad
{0x2002, (unsigned char) ' '}, // en space
{0x2003, (unsigned char) ' '}, // em space
{0x2004, (unsigned char) ' '}, // three-per-em space
{0x2005, (unsigned char) ' '}, // four-per-em space
{0x2006, (unsigned char) ' '}, // six-per-em space
{0x2010, (unsigned char) '-'}, // hyphen
{0x2011, (unsigned char) '-'}, // non-breaking hyphen
{0x2017, (unsigned char) '='}, // double low line
{0x201C, (unsigned char) '"'},
{0x201D, (unsigned char) '"'},
{0x2032, (unsigned char) '\''}, // prime
{0x2035, (unsigned char) '`'}, // reversed prime
{0x203C, (unsigned char) '!'}, // double exclamation mark
{0x2044, (unsigned char) '/'}, // fraction slash
{0x2074, (unsigned char) '4'}, // superscript four
{0x2075, (unsigned char) '5'}, // superscript five
{0x2076, (unsigned char) '6'}, // superscript six
{0x2077, (unsigned char) '7'}, // superscript seven
{0x2078, (unsigned char) '8'}, // superscript eight
{0x207F, (unsigned char) 'n'}, // superscript latin small letter n
{0x2080, (unsigned char) '0'}, // subscript zero
{0x2081, (unsigned char) '1'}, // subscript one
{0x2082, (unsigned char) '2'}, // subscript two
{0x2083, (unsigned char) '3'}, // subscript three
{0x2084, (unsigned char) '4'}, // subscript four
{0x2085, (unsigned char) '5'}, // subscript five
{0x2086, (unsigned char) '6'}, // subscript six
{0x2087, (unsigned char) '7'}, // subscript seven
{0x2088, (unsigned char) '8'}, // subscript eight
{0x2089, (unsigned char) '9'}, // subscript nine
{0x20A7, (unsigned char) 'P'}, // peseta sign
{0x2102, (unsigned char) 'C'}, // double-struck capital c
{0x2107, (unsigned char) 'E'}, // euler constant
{0x210A, (unsigned char) 'g'}, // script small g
{0x210B, (unsigned char) 'H'}, // script capital h
{0x210C, (unsigned char) 'H'}, // black-letter capital h
{0x210D, (unsigned char) 'H'}, // double-struck capital h
{0x210E, (unsigned char) 'h'}, // planck constant
{0x2110, (unsigned char) 'I'}, // script capital i
{0x2111, (unsigned char) 'I'}, // black-letter capital i
{0x2112, (unsigned char) 'L'}, // script capital l
{0x2113, (unsigned char) 'l'}, // script small l
{0x2115, (unsigned char) 'N'}, // double-struck capital n
{0x2118, (unsigned char) 'P'}, // script capital p
{0x2119, (unsigned char) 'P'}, // double-struck capital p
{0x211A, (unsigned char) 'Q'}, // double-struck capital q
{0x211B, (unsigned char) 'R'}, // script capital r
{0x211C, (unsigned char) 'R'}, // black-letter capital r
{0x211D, (unsigned char) 'R'}, // double-struck capital r
{0x2124, (unsigned char) 'Z'}, // double-struck capital z
{0x2128, (unsigned char) 'Z'}, // black-letter capital z
{0x212A, (unsigned char) 'K'}, // kelvin sign
{0x212C, (unsigned char) 'B'}, // script capital b
{0x212D, (unsigned char) 'C'}, // black-letter capital c
{0x212E, (unsigned char) 'e'}, // estimated symbol
{0x212F, (unsigned char) 'e'}, // script small e
{0x2130, (unsigned char) 'E'}, // script capital e
{0x2131, (unsigned char) 'F'}, // script capital f
{0x2133, (unsigned char) 'M'}, // script capital m
{0x2134, (unsigned char) 'o'}, // script small o
{0x2190, (unsigned char) '<'}, // leftwards arrow
{0x2191, (unsigned char) '^'}, // upwards arrow
{0x2192, (unsigned char) '>'}, // rightwards arrow
{0x2193, (unsigned char) 'v'}, // downwards arrow
{0x2194, (unsigned char) '-'}, // left right arrow
{0x2195, (unsigned char) '|'}, // up down arrow
{0x21A8, (unsigned char) '|'}, // up down arrow with base
{0x2212, (unsigned char) '-'}, // minus sign
{0x2215, (unsigned char) '/'}, // division slash
{0x2216, (unsigned char) '\\'}, // set minus
{0x2217, (unsigned char) '*'}, // asterisk operator
{0x221A, (unsigned char) 'v'}, // square root
{0x221E, (unsigned char) '8'}, // infinity
{0x221F, (unsigned char) 'L'}, // right angle
{0x2223, (unsigned char) '|'}, // divides
{0x2229, (unsigned char) 'n'}, // intersection
{0x2236, (unsigned char) ':'}, // ratio
{0x223C, (unsigned char) '~'}, // tilde operator
{0x2261, (unsigned char) '='}, // identical to
{0x2264, (unsigned char) '='}, // less-than or equal to
{0x2265, (unsigned char) '='}, // greater-than or equal to
{0x2303, (unsigned char) '^'}, // up arrowhead
{0x2320, (unsigned char) '('}, // top half integral
{0x2321, (unsigned char) ')'}, // bottom half integral
{0x2329, (unsigned char) '<'}, // left-pointing angle bracket
{0x232A, (unsigned char) '>'}, // right-pointing angle bracket
{0x25AC, (unsigned char) '-'}, // black rectangle
{0x25B2, (unsigned char) '^'}, // black up-pointing triangle
{0x25BA, (unsigned char) '>'}, // black right-pointing pointer
{0x25C4, (unsigned char) '<'}, // black left-pointing pointer
{0x25CB, (unsigned char) '0'}, // white circle
{0x25D9, (unsigned char) '0'}, // inverse white circle
{0x263A, (unsigned char) 'O'}, // white smiling face
{0x263B, (unsigned char) 'O'}, // black smiling face
{0x263C, (unsigned char) '0'}, // white sun with rays
{0x2640, (unsigned char) '+'}, // female sign
{0x2642, (unsigned char) '>'}, // male sign
{0x266A, (unsigned char) 'd'}, // eighth note
{0x266B, (unsigned char) 'd'}, // beamed eighth notes
{0x2758, (unsigned char) '|'}, // light vertical bar
{0x3000, (unsigned char) ' '}, // ideographic space
{0x3008, (unsigned char) '<'}, // left angle bracket
{0x3009, (unsigned char) '>'}, // right angle bracket
{0x301A, (unsigned char) '['}, // left white square bracket
{0x301B, (unsigned char) ']'}, // right white square bracket
{0x301D, (unsigned char) '"'}, // reversed double prime quotation ma
rk
{0x301E, (unsigned char) '"'} // double prime quotation mark
}; };
cet_cs_vec_t cet_cs_vec_ansi_x3_4_1968 = /* defined in cet.h */ cet_cs_vec_t cet_cs_vec_ansi_x3_4_1968 = /* defined in cet.h */
{ {
cet_cs_name_ansi_x3_4_1968, /* name of character set */ cet_cs_name_ansi_x3_4_1968, /* name of character set */
cet_cs_alias_ansi_x3_4_1968, /* alias table */ cet_cs_alias_ansi_x3_4_1968, /* alias table */
NULL, /* ... to UCS-4 converter (m NULL, /* fallback character set */
ulti-byte) */ NULL, /* unused */
NULL, /* UCS-4 to ... converter (m
ulti-byte) */
cet_ucs4_map_ansi_x3_4_1968, /* char to UCS-4 value table */ cet_ucs4_map_ansi_x3_4_1968, /* char to UCS-4 value table */
cet_ucs4_ofs_ansi_x3_4_1968, /* first non standard charac ter */ cet_ucs4_ofs_ansi_x3_4_1968, /* first non standard charac ter */
cet_ucs4_cnt_ansi_x3_4_1968, /* number of values in table */ cet_ucs4_cnt_ansi_x3_4_1968, /* number of values in table */
cet_ucs4_to_ansi_x3_4_1968_links, /* UCS-4 to char links */ cet_ucs4_to_ansi_x3_4_1968_links, /* UCS-4 to char links */
cet_ucs4_to_ansi_x3_4_1968_ct, /* number of links */ cet_ucs4_to_ansi_x3_4_1968_ct, /* number of links */
cet_ucs4_to_ansi_x3_4_1968_extra, /* hand made UCS-4 links */ cet_ucs4_to_ansi_x3_4_1968_extra, /* hand made UCS-4 links */
sizeof(cet_ucs4_to_ansi_x3_4_1968_extra) / sizeof(cet_ucs4_to_ansi_x 3_4_1968_extra[0]), /* number of extra link s */ sizeof(cet_ucs4_to_ansi_x3_4_1968_extra) / sizeof(cet_ucs4_to_ansi_x 3_4_1968_extra[0]), /* number of extra link s */
 End of changes. 2 change blocks. 
196 lines changed or deleted 482 lines changed or added


 cet.h   cet.h 
skipping to change at line 29 skipping to change at line 29
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA
*/ */
#ifndef CET_H #ifndef CET_H
#define CET_H #define CET_H
#include <ctype.h> #include <ctype.h>
#include <stdio.h> #include <stdio.h>
#define CET_ERROR 1 #define CET_ERROR 1
#define CET_SUCESS 0 #define CET_SUCCESS 0
typedef struct cet_ucs4_link_s typedef struct cet_ucs4_link_s
{ {
int value; /* UCS-4 value */ int value; /* UCS-4 value */
short origin; /* associeted character */ short origin; /* associeted character */
} cet_ucs4_link_t; } cet_ucs4_link_t;
typedef struct cet_cs_vec_s typedef struct cet_cs_vec_s
{ {
const char *name; /* name of character set */ const char *name; /* name of character set */
const char **alias; /* alias table */ const char **alias; /* alias table */
int (*decode)(const char *, int *); /* ... to UCS-4 decoder struct cet_cs_vec_s *fallback; /* fallback character set
!FUTURE! */ */
short (*encode)(const int); /* UCS-4 to ... encoder void *unused;
!FUTURE! */
const int *ucs4_map; /* char to UCS-4 value table */ const int *ucs4_map; /* char to UCS-4 value table */
const int ucs4_offset; /* first non standard charac ter */ const int ucs4_offset; /* first non standard charac ter */
const int ucs4_count; /* values in table */ const int ucs4_count; /* values in table */
const cet_ucs4_link_t *ucs4_link; /* UCS-4 to char backward li nks */ const cet_ucs4_link_t *ucs4_link; /* UCS-4 to char backward li nks */
const int ucs4_links; /* number of links */ const int ucs4_links; /* number of links */
const cet_ucs4_link_t *ucs4_extra; /* Non standard UCS-4 to ... */ const cet_ucs4_link_t *ucs4_extra; /* Non standard UCS-4 to ... */
const int ucs4_extras; /* number of extra links */ const int ucs4_extras; /* number of extra links */
struct cet_cs_vec_s *next; struct cet_cs_vec_s *next;
} cet_cs_vec_t; } cet_cs_vec_t;
 End of changes. 2 change blocks. 
5 lines changed or deleted 4 lines changed or added


 config.h   config.h 
/* config.h. Generated by configure. */ /* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.in by autoheader. */ /* config.h.in. Generated from configure.in by autoheader. */
/* 0 for most-used character sets */ /* 0 for most-used character sets */
#define CET_WANTED 0 #define CET_WANTED 0
/* 1 to enable the CSV formats support */ /* 1 to enable the CSV formats support */
#define CSVFMTS_ENABLED 1 #define CSVFMTS_ENABLED 1
/* 1 to enable all the filters. */ /* 1 to enable all the filters. */
#define FILTERS_ENABLED 1 #define FILTERS_ENABLED 1
skipping to change at line 41 skipping to change at line 41
/* Define to the address where bug reports for this package should be sent. */ /* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "BUG-REPORT-ADDRESS" #define PACKAGE_BUGREPORT "BUG-REPORT-ADDRESS"
/* Define to the full name of this package. */ /* Define to the full name of this package. */
#define PACKAGE_NAME "GPSBabel" #define PACKAGE_NAME "GPSBabel"
/* Define to the release name of this package. */ /* Define to the release name of this package. */
#define PACKAGE_RELEASE "" #define PACKAGE_RELEASE ""
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "GPSBabel 1.3.3" #define PACKAGE_STRING "GPSBabel 1.3.4"
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "gpsbabel" #define PACKAGE_TARNAME "gpsbabel"
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "1.3.3" #define PACKAGE_VERSION "1.3.4"
/* 1 to enable Palm PDB support */ /* 1 to enable Palm PDB support */
#define PDBFMTS_ENABLED 1 #define PDBFMTS_ENABLED 1
/* 1 to enable shapefile support */ /* 1 to enable shapefile support */
#define SHAPELIB_ENABLED 1 #define SHAPELIB_ENABLED 1
/* Define to 1 if your processor stores words with the most significant byt e /* Define to 1 if your processor stores words with the most significant byt e
first (like Motorola and SPARC, unlike Intel and VAX). */ first (like Motorola and SPARC, unlike Intel and VAX). */
/* #undef WORDS_BIGENDIAN */ /* #undef WORDS_BIGENDIAN */
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 cp1250.h   cp1250.h 
skipping to change at line 137 skipping to change at line 137
{0x2021, 0x87} /* dagger */, {0x2021, 0x87} /* dagger */,
{0x2022, 0x95} /* puce */, {0x2022, 0x95} /* puce */,
{0x2026, 0x85} /* horizontal ellipsis */, {0x2026, 0x85} /* horizontal ellipsis */,
{0x2030, 0x89} /* mille sign */, {0x2030, 0x89} /* mille sign */,
{0x2039, 0x8b} /* left-pointing angle quotation mark */, {0x2039, 0x8b} /* left-pointing angle quotation mark */,
{0x203a, 0x9b} /* right-pointing angle quotation mark */, {0x203a, 0x9b} /* right-pointing angle quotation mark */,
{0x20ac, 0x80} /* euro */, {0x20ac, 0x80} /* euro */,
{0x2122, 0x99} /* mark sign */ {0x2122, 0x99} /* mark sign */
}; };
/* /* Extra table was generated from bestfit1250.txt located at
#define cet_ucs4_to_cp1250_extra_ct 0 ftp.unicode.org:/Public/MAPPINGS/VENDORS/MICSFT/WindowsBestFit/ */
const cet_ucs4_link_t cet_ucs4_to_cp1250_extra[cet_ucs4_to_cp1250_extra_ct]
= {}; const cet_ucs4_link_t cet_ucs4_to_cp1250_extra[] =
*/ {
{0x0189, 0xd0} /* latin capital letter african d */,
{0x02bb, 0x91} /* modifier letter turned comma */,
{0x02c9, 0xaf} /* modifier letter macron */,
{0x02ca, 0xb4} /* modifier letter acute accent */,
{0x02da, 0xb0} /* ring above */,
{0x0301, 0xb4} /* combining acute accent */,
{0x0304, 0xaf} /* combining macron */,
{0x0305, 0xaf} /* combining overline */,
{0x0306, 0xa2} /* combining breve */,
{0x0307, 0xff} /* combining dot above */,
{0x0308, 0xa8} /* combining diaeresis */,
{0x030a, 0xb0} /* combining ring above */,
{0x030c, 0xa1} /* combining caron */,
{0x0327, 0xb8} /* combining cedilla */,
{0x03b2, 0xdf} /* greek small letter beta */,
{0x03bc, 0xb5} /* greek small letter mu */,
{0x2024, 0x95} /* one dot leader */,
{0x2033, 0x94} /* double prime */,
{0x2070, 0xb0} /* superscript zero */,
{0x20a4, 0xa3} /* lira sign */,
{0x212b, 0xc5} /* angstrom sign */,
{0x2190, 0x8b} /* leftwards arrow */,
{0x2192, 0x9b} /* rightwards arrow */,
{0x2193, 0xa1} /* downwards arrow */,
{0x2205, 0xd8} /* empty set */,
{0x2213, 0xb1} /* minus-or-plus sign */,
{0x2218, 0xb0} /* ring operator */,
{0x2219, 0x95} /* bullet operator */,
{0x226a, 0xab} /* much less-than */,
{0x226b, 0xbb} /* much greater-than */,
{0x22c5, 0xb7} /* dot operator */,
{0x2302, 0xa6} /* house */,
{0x2500, 0xa6} /* box drawings light horizontal */,
{0x2510, 0xac} /* box drawings light down and left */,
{0x2551, 0xa6} /* box drawings double vertical */,
{0x2557, 0xac} /* box drawings double down and left */,
{0x2560, 0xa6} /* box drawings double vertical and right */,
{0x2563, 0xa6} /* box drawings double vertical and left */,
{0x2569, 0xa6} /* box drawings double up and horizontal */,
{0x25a0, 0xa6} /* black square */,
{0x25bc, 0xa1} /* black down-pointing triangle */,
{0x25d8, 0x95} /* inverse bullet */,
{0x263a, 0xa2} /* white smiling face */,
{0x263b, 0xa2} /* black smiling face */,
{0x2660, 0xa6} /* black spade suit */,
{0x2663, 0xa6} /* black club suit */,
{0x2665, 0xa6} /* black heart suit */,
{0x2666, 0xa6} /* black diamond suit */,
{0x275b, 0x91} /* heavy single turned comma quotation mark ornament
*/,
{0x275c, 0x92} /* heavy single comma quotation mark ornament */,
{0x275d, 0x93} /* heavy double turned comma quotation mark ornament
*/,
{0x275e, 0x94} /* heavy double comma quotation mark ornament */,
{0x300a, 0xab} /* left double angle bracket */,
{0x300b, 0xbb} /* right double angle bracket */,
{0x301d, 0x93} /* reversed double prime quotation mark */,
{0x301e, 0x94} /* double prime quotation mark */,
{0x301f, 0x84} /* low double prime quotation mark */,
{0x30fb, 0xb7} /* katakana middle dot */,
{0x30fc, 0x97} /* katakana-hiragana prolonged sound mark */
};
#define cet_ucs4_to_cp1250_extra_ct sizeof(cet_ucs4_to_cp1250_extra) / size
of(cet_ucs4_to_cp1250_extra[0])
cet_cs_vec_t cet_cs_vec_cp1250 = /* defined in cet.h */ cet_cs_vec_t cet_cs_vec_cp1250 = /* defined in cet.h */
{ {
cet_cs_name_cp1250, /* name of character set */ cet_cs_name_cp1250, /* name of character set */
cet_cs_alias_cp1250, /* alias table */ cet_cs_alias_cp1250, /* alias table */
NULL, /* ... to UCS-4 converter (multi-byt e) */ NULL, /* ... to UCS-4 converter (multi-byt e) */
NULL, /* UCS-4 to ... converter (multi-byt e) */ NULL, /* UCS-4 to ... converter (multi-byt e) */
cet_ucs4_map_cp1250, /* char to UCS-4 value table */ cet_ucs4_map_cp1250, /* char to UCS-4 value table */
cet_ucs4_ofs_cp1250, /* first non standard character */ cet_ucs4_ofs_cp1250, /* first non standard character */
cet_ucs4_cnt_cp1250, /* number of values in table */ cet_ucs4_cnt_cp1250, /* number of values in table */
cet_ucs4_to_cp1250_links, /* UCS-4 to char links */ cet_ucs4_to_cp1250_links, /* UCS-4 to char links */
cet_ucs4_to_cp1250_ct, /* number of links */ cet_ucs4_to_cp1250_ct, /* number of links */
NULL, /* hand made UCS-4 links */ cet_ucs4_to_cp1250_extra, /* hand made UCS-4 links */
0, /* number of extra links */ cet_ucs4_to_cp1250_extra_ct, /* number of extra links */
NULL /* for internal use */ NULL /* for internal use */
}; };
/* /*
const int cp1250_ucs4_full_map[] = const int cp1250_ucs4_full_map[] =
{ {
0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
 End of changes. 2 change blocks. 
7 lines changed or deleted 72 lines changed or added


 cp1251.h   cp1251.h 
skipping to change at line 175 skipping to change at line 175
{0x2022, 0x95} /* puce */, {0x2022, 0x95} /* puce */,
{0x2026, 0x85} /* horizontal ellipsis */, {0x2026, 0x85} /* horizontal ellipsis */,
{0x2030, 0x89} /* mille sign */, {0x2030, 0x89} /* mille sign */,
{0x2039, 0x8b} /* left-pointing angle quotation mark */, {0x2039, 0x8b} /* left-pointing angle quotation mark */,
{0x203a, 0x9b} /* right-pointing angle quotation mark */, {0x203a, 0x9b} /* right-pointing angle quotation mark */,
{0x20ac, 0x88} /* euro */, {0x20ac, 0x88} /* euro */,
{0x2116, 0xb9} /* sign */, {0x2116, 0xb9} /* sign */,
{0x2122, 0x99} /* mark sign */ {0x2122, 0x99} /* mark sign */
}; };
/* /* Extra table was generated from bestfit1251.txt located at
#define cet_ucs4_to_cp1251_extra_ct 0 ftp.unicode.org:/Public/MAPPINGS/VENDORS/MICSFT/WindowsBestFit/ */
const cet_ucs4_link_t cet_ucs4_to_cp1251_extra[cet_ucs4_to_cp1251_extra_ct]
= {}; const cet_ucs4_link_t cet_ucs4_to_cp1251_extra[] =
*/ {
{0x2195, 0xa6} /* up down arrow */,
{0x21a8, 0xa6} /* up down arrow with base */,
{0x2219, 0x95} /* bullet operator */,
{0x2302, 0xa6} /* house */,
{0x2502, 0xa6} /* box drawings light vertical */,
{0x2510, 0xac} /* box drawings light down and left */,
{0x2551, 0xa6} /* box drawings double vertical */,
{0x2553, 0xe3} /* box drawings down double and right single */,
{0x2554, 0xe3} /* box drawings double down and right */,
{0x2555, 0xac} /* box drawings down single and left double */,
{0x2556, 0xac} /* box drawings down double and left single */,
{0x2557, 0xac} /* box drawings double down and left */,
{0x255e, 0xa6} /* box drawings vertical single and right double */,
{0x255f, 0xa6} /* box drawings vertical double and right single */,
{0x2560, 0xa6} /* box drawings double vertical and right */,
{0x2561, 0xa6} /* box drawings vertical single and left double */,
{0x2562, 0xa6} /* box drawings vertical double and left single */,
{0x2563, 0xa6} /* box drawings double vertical and left */,
{0x2567, 0xa6} /* box drawings up single and horizontal double */,
{0x2568, 0xa6} /* box drawings up double and horizontal single */,
{0x2569, 0xa6} /* box drawings double up and horizontal */,
{0x258c, 0xa6} /* left half block */,
{0x2590, 0xa6} /* right half block */,
{0x25a0, 0xa6} /* black square */,
{0x25bc, 0xa1} /* black down-pointing triangle */,
{0x25d8, 0x95} /* inverse bullet */,
{0x2660, 0xa6} /* black spade suit */,
{0x2663, 0xa6} /* black club suit */,
{0x2665, 0xa6} /* black heart suit */,
{0x2666, 0xa6} /* black diamond suit */
};
#define cet_ucs4_to_cp1251_extra_ct sizeof(cet_ucs4_to_cp1251_extra) / size
of(cet_ucs4_to_cp1251_extra[0])
cet_cs_vec_t cet_cs_vec_cp1251 = /* defined in cet.h */ cet_cs_vec_t cet_cs_vec_cp1251 = /* defined in cet.h */
{ {
cet_cs_name_cp1251, /* name of character set */ cet_cs_name_cp1251, /* name of character set */
cet_cs_alias_cp1251, /* alias table */ cet_cs_alias_cp1251, /* alias table */
NULL, /* ... to UCS-4 converter (multi-byt e) */ NULL, /* ... to UCS-4 converter (multi-byt e) */
NULL, /* UCS-4 to ... converter (multi-byt e) */ NULL, /* UCS-4 to ... converter (multi-byt e) */
cet_ucs4_map_cp1251, /* char to UCS-4 value table */ cet_ucs4_map_cp1251, /* char to UCS-4 value table */
cet_ucs4_ofs_cp1251, /* first non standard character */ cet_ucs4_ofs_cp1251, /* first non standard character */
cet_ucs4_cnt_cp1251, /* number of values in table */ cet_ucs4_cnt_cp1251, /* number of values in table */
cet_ucs4_to_cp1251_links, /* UCS-4 to char links */ cet_ucs4_to_cp1251_links, /* UCS-4 to char links */
cet_ucs4_to_cp1251_ct, /* number of links */ cet_ucs4_to_cp1251_ct, /* number of links */
NULL, /* hand made UCS-4 links */ cet_ucs4_to_cp1251_extra, /* hand made UCS-4 links */
0, /* number of extra links */ cet_ucs4_to_cp1251_extra_ct, /* number of extra links */
NULL /* for internal use */ NULL /* for internal use */
}; };
/* /*
const int cp1251_ucs4_full_map[] = const int cp1251_ucs4_full_map[] =
{ {
0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
 End of changes. 2 change blocks. 
7 lines changed or deleted 41 lines changed or added


 cp1252.h   cp1252.h 
skipping to change at line 90 skipping to change at line 90
{0x2021, 0x87} /* dagger */, {0x2021, 0x87} /* dagger */,
{0x2022, 0x95} /* puce */, {0x2022, 0x95} /* puce */,
{0x2026, 0x85} /* horizontal ellipsis */, {0x2026, 0x85} /* horizontal ellipsis */,
{0x2030, 0x89} /* mille sign */, {0x2030, 0x89} /* mille sign */,
{0x2039, 0x8b} /* left-pointing angle quotation mark */, {0x2039, 0x8b} /* left-pointing angle quotation mark */,
{0x203a, 0x9b} /* right-pointing angle quotation mark */, {0x203a, 0x9b} /* right-pointing angle quotation mark */,
{0x20ac, 0x80} /* euro */, {0x20ac, 0x80} /* euro */,
{0x2122, 0x99} /* mark sign */ {0x2122, 0x99} /* mark sign */
}; };
/* /* Extra table was generated from bestfit1252.txt located at
#define cet_ucs4_to_cp1252_extra_ct 0 ftp.unicode.org:/Public/MAPPINGS/VENDORS/MICSFT/WindowsBestFit/ */
const cet_ucs4_link_t cet_ucs4_to_cp1252_extra[cet_ucs4_to_cp1252_extra_ct]
= {}; const cet_ucs4_link_t cet_ucs4_to_cp1252_extra[] =
*/ {
{0x0110, 0xd0} /* latin capital letter d with stroke */,
{0x0189, 0xd0} /* latin capital letter african d */,
{0x0191, 0x83} /* latin capital letter f with hook */,
{0x02c9, 0xaf} /* modifier letter macron */,
{0x02ca, 0xb4} /* modifier letter acute accent */,
{0x02da, 0xb0} /* ring above */,
{0x0301, 0xb4} /* combining acute accent */,
{0x0304, 0xaf} /* combining macron */,
{0x0305, 0xaf} /* combining overline */,
{0x0308, 0xa8} /* combining diaeresis */,
{0x030a, 0xb0} /* combining ring above */,
{0x0327, 0xb8} /* combining cedilla */,
{0x03b2, 0xdf} /* greek small letter beta */,
{0x03bc, 0xb5} /* greek small letter mu */,
{0x2024, 0xb7} /* one dot leader */,
{0x2070, 0xb0} /* superscript zero */,
{0x20a1, 0xa2} /* colon sign */,
{0x20a4, 0xa3} /* lira sign */,
{0x212b, 0xc5} /* angstrom sign */,
{0x2205, 0xd8} /* empty set */,
{0x2213, 0xb1} /* minus-or-plus sign */,
{0x2218, 0xb0} /* ring operator */,
{0x2219, 0xb7} /* bullet operator */,
{0x2248, 0x98} /* almost equal to */,
{0x226a, 0xab} /* much less-than */,
{0x226b, 0xbb} /* much greater-than */,
{0x22c5, 0xb7} /* dot operator */,
{0x2302, 0xa6} /* house */,
{0x2310, 0xac} /* reversed not sign */,
{0x2502, 0xa6} /* box drawings light vertical */,
{0x2524, 0xa6} /* box drawings light vertical and left */,
{0x2551, 0xa6} /* box drawings double vertical */,
{0x255e, 0xa6} /* box drawings vertical single and right double */,
{0x255f, 0xa6} /* box drawings vertical double and right single */,
{0x2560, 0xa6} /* box drawings double vertical and right */,
{0x2561, 0xa6} /* box drawings vertical single and left double */,
{0x2562, 0xa6} /* box drawings vertical double and left single */,
{0x2563, 0xa6} /* box drawings double vertical and left */,
{0x2580, 0xaf} /* upper half block */,
{0x2588, 0xa6} /* full block */,
{0x258c, 0xa6} /* left half block */,
{0x2590, 0xa6} /* right half block */,
{0x2591, 0xa6} /* light shade */,
{0x2592, 0xa6} /* medium shade */,
{0x2593, 0xa6} /* dark shade */,
{0x25a0, 0xa6} /* black square */,
{0x263c, 0xa4} /* white sun with rays */,
{0x300a, 0xab} /* left double angle bracket */,
{0x300b, 0xbb} /* right double angle bracket */,
{0x30fb, 0xb7} /* katakana middle dot */
};
#define cet_ucs4_to_cp1252_extra_ct sizeof(cet_ucs4_to_cp1252_extra) / size
of(cet_ucs4_to_cp1252_extra[0])
cet_cs_vec_t cet_cs_vec_cp1252 = /* defined in cet.h */ cet_cs_vec_t cet_cs_vec_cp1252 = /* defined in cet.h */
{ {
cet_cs_name_cp1252, /* name of character set */ cet_cs_name_cp1252, /* name of character set */
cet_cs_alias_cp1252, /* alias table */ cet_cs_alias_cp1252, /* alias table */
NULL, /* ... to UCS-4 converter (multi-byt e) */ NULL, /* ... to UCS-4 converter (multi-byt e) */
NULL, /* UCS-4 to ... converter (multi-byt e) */ NULL, /* UCS-4 to ... converter (multi-byt e) */
cet_ucs4_map_cp1252, /* char to UCS-4 value table */ cet_ucs4_map_cp1252, /* char to UCS-4 value table */
cet_ucs4_ofs_cp1252, /* first non standard character */ cet_ucs4_ofs_cp1252, /* first non standard character */
cet_ucs4_cnt_cp1252, /* number of values in table */ cet_ucs4_cnt_cp1252, /* number of values in table */
cet_ucs4_to_cp1252_links, /* UCS-4 to char links */ cet_ucs4_to_cp1252_links, /* UCS-4 to char links */
cet_ucs4_to_cp1252_ct, /* number of links */ cet_ucs4_to_cp1252_ct, /* number of links */
NULL, /* hand made UCS-4 links */ cet_ucs4_to_cp1252_extra, /* hand made UCS-4 links */
0, /* number of extra links */ cet_ucs4_to_cp1252_extra_ct, /* number of extra links */
NULL /* for internal use */ NULL /* for internal use */
}; };
/* /*
const int cp1252_ucs4_full_map[] = const int cp1252_ucs4_full_map[] =
{ {
0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
 End of changes. 2 change blocks. 
7 lines changed or deleted 61 lines changed or added


 cp1253.h   cp1253.h 
skipping to change at line 153 skipping to change at line 153
{0x2021, 0x87} /* dagger */, {0x2021, 0x87} /* dagger */,
{0x2022, 0x95} /* puce */, {0x2022, 0x95} /* puce */,
{0x2026, 0x85} /* horizontal ellipsis */, {0x2026, 0x85} /* horizontal ellipsis */,
{0x2030, 0x89} /* mille sign */, {0x2030, 0x89} /* mille sign */,
{0x2039, 0x8b} /* left-pointing angle quotation mark */, {0x2039, 0x8b} /* left-pointing angle quotation mark */,
{0x203a, 0x9b} /* right-pointing angle quotation mark */, {0x203a, 0x9b} /* right-pointing angle quotation mark */,
{0x20ac, 0x80} /* euro */, {0x20ac, 0x80} /* euro */,
{0x2122, 0x99} /* mark sign */ {0x2122, 0x99} /* mark sign */
}; };
/* /* Extra table was generated from bestfit1253.txt located at
#define cet_ucs4_to_cp1253_extra_ct 0 ftp.unicode.org:/Public/MAPPINGS/VENDORS/MICSFT/WindowsBestFit/ */
const cet_ucs4_link_t cet_ucs4_to_cp1253_extra[cet_ucs4_to_cp1253_extra_ct]
= {}; const cet_ucs4_link_t cet_ucs4_to_cp1253_extra[] =
*/ {
{0x0191, 0x83} /* latin capital letter f with hook */,
{0x030d, 0xb4} /* combining vertical line above */,
{0x2195, 0xa6} /* up down arrow */,
{0x21a8, 0xa6} /* up down arrow with base */,
{0x2302, 0xa6} /* house */,
{0x2502, 0xa6} /* box drawings light vertical */,
{0x2510, 0xac} /* box drawings light down and left */,
{0x2551, 0xa6} /* box drawings double vertical */,
{0x2557, 0xac} /* box drawings double down and left */,
{0x2560, 0xa6} /* box drawings double vertical and right */,
{0x2563, 0xa6} /* box drawings double vertical and left */,
{0x2569, 0xa6} /* box drawings double up and horizontal */,
{0x25a0, 0xa6} /* black square */,
{0x25bc, 0xa1} /* black down-pointing triangle */,
{0x25d8, 0x95} /* inverse bullet */,
{0x2660, 0xa6} /* black spade suit */,
{0x2663, 0xa6} /* black club suit */,
{0x2665, 0xa6} /* black heart suit */,
{0x2666, 0xa6} /* black diamond suit */
};
#define cet_ucs4_to_cp1253_extra_ct sizeof(cet_ucs4_to_cp1253_extra) / size
of(cet_ucs4_to_cp1253_extra[0])
cet_cs_vec_t cet_cs_vec_cp1253 = /* defined in cet.h */ cet_cs_vec_t cet_cs_vec_cp1253 = /* defined in cet.h */
{ {
cet_cs_name_cp1253, /* name of character set */ cet_cs_name_cp1253, /* name of character set */
cet_cs_alias_cp1253, /* alias table */ cet_cs_alias_cp1253, /* alias table */
NULL, /* ... to UCS-4 converter (multi-byt e) */ NULL, /* ... to UCS-4 converter (multi-byt e) */
NULL, /* UCS-4 to ... converter (multi-byt e) */ NULL, /* UCS-4 to ... converter (multi-byt e) */
cet_ucs4_map_cp1253, /* char to UCS-4 value table */ cet_ucs4_map_cp1253, /* char to UCS-4 value table */
cet_ucs4_ofs_cp1253, /* first non standard character */ cet_ucs4_ofs_cp1253, /* first non standard character */
cet_ucs4_cnt_cp1253, /* number of values in table */ cet_ucs4_cnt_cp1253, /* number of values in table */
cet_ucs4_to_cp1253_links, /* UCS-4 to char links */ cet_ucs4_to_cp1253_links, /* UCS-4 to char links */
cet_ucs4_to_cp1253_ct, /* number of links */ cet_ucs4_to_cp1253_ct, /* number of links */
NULL, /* hand made UCS-4 links */ cet_ucs4_to_cp1253_extra, /* hand made UCS-4 links */
0, /* number of extra links */ cet_ucs4_to_cp1253_extra_ct, /* number of extra links */
NULL /* for internal use */ NULL /* for internal use */
}; };
/* /*
const int cp1253_ucs4_full_map[] = const int cp1253_ucs4_full_map[] =
{ {
0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
 End of changes. 2 change blocks. 
7 lines changed or deleted 30 lines changed or added


 cp1254.h   cp1254.h 
skipping to change at line 97 skipping to change at line 97
{0x2021, 0x87} /* dagger */, {0x2021, 0x87} /* dagger */,
{0x2022, 0x95} /* puce */, {0x2022, 0x95} /* puce */,
{0x2026, 0x85} /* horizontal ellipsis */, {0x2026, 0x85} /* horizontal ellipsis */,
{0x2030, 0x89} /* mille sign */, {0x2030, 0x89} /* mille sign */,
{0x2039, 0x8b} /* left-pointing angle quotation mark */, {0x2039, 0x8b} /* left-pointing angle quotation mark */,
{0x203a, 0x9b} /* right-pointing angle quotation mark */, {0x203a, 0x9b} /* right-pointing angle quotation mark */,
{0x20ac, 0x80} /* euro */, {0x20ac, 0x80} /* euro */,
{0x2122, 0x99} /* mark sign */ {0x2122, 0x99} /* mark sign */
}; };
/* /* Extra table was generated from bestfit1254.txt located at
#define cet_ucs4_to_cp1254_extra_ct 0 ftp.unicode.org:/Public/MAPPINGS/VENDORS/MICSFT/WindowsBestFit/ */
const cet_ucs4_link_t cet_ucs4_to_cp1254_extra[cet_ucs4_to_cp1254_extra_ct]
= {}; const cet_ucs4_link_t cet_ucs4_to_cp1254_extra[] =
*/ {
{0x0191, 0x83} /* latin capital letter f with hook */,
{0x02bb, 0x91} /* modifier letter turned comma */,
{0x02c9, 0xaf} /* modifier letter macron */,
{0x02ca, 0xb4} /* modifier letter acute accent */,
{0x02da, 0xb0} /* ring above */,
{0x02db, 0xb8} /* ogonek */,
{0x02dd, 0xa8} /* double acute accent */,
{0x0301, 0xb4} /* combining acute accent */,
{0x0303, 0x98} /* combining tilde */,
{0x0304, 0xaf} /* combining macron */,
{0x0305, 0xaf} /* combining overline */,
{0x0306, 0x88} /* combining breve */,
{0x0307, 0xb7} /* combining dot above */,
{0x0308, 0xa8} /* combining diaeresis */,
{0x030a, 0xa7} /* combining ring above */,
{0x030c, 0x88} /* combining caron */,
{0x030e, 0xa8} /* combining double vertical line above */,
{0x0327, 0xb8} /* combining cedilla */,
{0x03b2, 0xdf} /* greek small letter beta */,
{0x03bc, 0xb5} /* greek small letter mu */,
{0x2024, 0x95} /* one dot leader */,
{0x2033, 0xa8} /* double prime */,
{0x2070, 0xb0} /* superscript zero */,
{0x2080, 0xb0} /* subscript zero */,
{0x2082, 0xb2} /* subscript two */,
{0x2083, 0xb3} /* subscript three */,
{0x20a4, 0xa3} /* lira sign */,
{0x212b, 0xc5} /* angstrom sign */,
{0x2190, 0x8b} /* leftwards arrow */,
{0x2192, 0x9b} /* rightwards arrow */,
{0x2205, 0xd8} /* empty set */,
{0x2213, 0xb1} /* minus-or-plus sign */,
{0x2218, 0xb0} /* ring operator */,
{0x2219, 0x95} /* bullet operator */,
{0x226a, 0xab} /* much less-than */,
{0x226b, 0xbb} /* much greater-than */,
{0x22c5, 0xb7} /* dot operator */,
{0x2302, 0xa6} /* house */,
{0x2500, 0xa6} /* box drawings light horizontal */,
{0x2510, 0xac} /* box drawings light down and left */,
{0x2551, 0xa6} /* box drawings double vertical */,
{0x2557, 0xac} /* box drawings double down and left */,
{0x2560, 0xa6} /* box drawings double vertical and right */,
{0x2563, 0xa6} /* box drawings double vertical and left */,
{0x2569, 0xa6} /* box drawings double up and horizontal */,
{0x25a0, 0xa6} /* black square */,
{0x25bc, 0xa1} /* black down-pointing triangle */,
{0x25d8, 0x95} /* inverse bullet */,
{0x2660, 0xa6} /* black spade suit */,
{0x2663, 0xa6} /* black club suit */,
{0x2665, 0xa6} /* black heart suit */,
{0x2666, 0xa6} /* black diamond suit */,
{0x275b, 0x91} /* heavy single turned comma quotation mark ornament
*/,
{0x275c, 0x92} /* heavy single comma quotation mark ornament */,
{0x275d, 0x93} /* heavy double turned comma quotation mark ornament
*/,
{0x275e, 0x94} /* heavy double comma quotation mark ornament */,
{0x300a, 0xab} /* left double angle bracket */,
{0x300b, 0xbb} /* right double angle bracket */,
{0x301f, 0x84} /* low double prime quotation mark */,
{0x30fb, 0xb7} /* katakana middle dot */,
{0x30fc, 0x97} /* katakana-hiragana prolonged sound mark */
};
#define cet_ucs4_to_cp1254_extra_ct sizeof(cet_ucs4_to_cp1254_extra) / size
of(cet_ucs4_to_cp1254_extra[0])
cet_cs_vec_t cet_cs_vec_cp1254 = /* defined in cet.h */ cet_cs_vec_t cet_cs_vec_cp1254 = /* defined in cet.h */
{ {
cet_cs_name_cp1254, /* name of character set */ cet_cs_name_cp1254, /* name of character set */
cet_cs_alias_cp1254, /* alias table */ cet_cs_alias_cp1254, /* alias table */
NULL, /* ... to UCS-4 converter (multi-byt e) */ NULL, /* ... to UCS-4 converter (multi-byt e) */
NULL, /* UCS-4 to ... converter (multi-byt e) */ NULL, /* UCS-4 to ... converter (multi-byt e) */
cet_ucs4_map_cp1254, /* char to UCS-4 value table */ cet_ucs4_map_cp1254, /* char to UCS-4 value table */
cet_ucs4_ofs_cp1254, /* first non standard character */ cet_ucs4_ofs_cp1254, /* first non standard character */
cet_ucs4_cnt_cp1254, /* number of values in table */ cet_ucs4_cnt_cp1254, /* number of values in table */
cet_ucs4_to_cp1254_links, /* UCS-4 to char links */ cet_ucs4_to_cp1254_links, /* UCS-4 to char links */
cet_ucs4_to_cp1254_ct, /* number of links */ cet_ucs4_to_cp1254_ct, /* number of links */
NULL, /* hand made UCS-4 links */ cet_ucs4_to_cp1254_extra, /* hand made UCS-4 links */
0, /* number of extra links */ cet_ucs4_to_cp1254_extra_ct, /* number of extra links */
NULL /* for internal use */ NULL /* for internal use */
}; };
/* /*
const int cp1254_ucs4_full_map[] = const int cp1254_ucs4_full_map[] =
{ {
0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
 End of changes. 2 change blocks. 
7 lines changed or deleted 74 lines changed or added


 cp1255.h   cp1255.h 
skipping to change at line 114 skipping to change at line 114
{0x2022, 0x95} /* puce */, {0x2022, 0x95} /* puce */,
{0x2026, 0x85} /* horizontal ellipsis */, {0x2026, 0x85} /* horizontal ellipsis */,
{0x2030, 0x89} /* mille sign */, {0x2030, 0x89} /* mille sign */,
{0x2039, 0x8b} /* left-pointing angle quotation mark */, {0x2039, 0x8b} /* left-pointing angle quotation mark */,
{0x203a, 0x9b} /* right-pointing angle quotation mark */, {0x203a, 0x9b} /* right-pointing angle quotation mark */,
{0x203e, 0xaf} /* overline */, {0x203e, 0xaf} /* overline */,
{0x20ac, 0x80} /* euro */, {0x20ac, 0x80} /* euro */,
{0x2122, 0x99} /* mark sign */ {0x2122, 0x99} /* mark sign */
}; };
/* /* Extra table was generated from bestfit1255.txt located at
#define cet_ucs4_to_cp1255_extra_ct 0 ftp.unicode.org:/Public/MAPPINGS/VENDORS/MICSFT/WindowsBestFit/ */
const cet_ucs4_link_t cet_ucs4_to_cp1255_extra[cet_ucs4_to_cp1255_extra_ct]
= {}; const cet_ucs4_link_t cet_ucs4_to_cp1255_extra[] =
*/ {
{0x02c6, 0x88} /* modifier letter circumflex */,
{0x02dc, 0x98} /* spacing tilde */,
{0x05b0, 0xc0} /* hebrew point sheva */,
{0x05b1, 0xc1} /* hebrew point hataf segol */,
{0x05b2, 0xc2} /* hebrew point hataf patah */,
{0x05b3, 0xc3} /* hebrew point hataf qamats */,
{0x05b4, 0xc4} /* hebrew point hiriq */,
{0x05b5, 0xc5} /* hebrew point tsere */,
{0x05b6, 0xc6} /* hebrew point segol */,
{0x05b7, 0xc7} /* hebrew point patah */,
{0x05b8, 0xc8} /* hebrew point qamats */,
{0x05b9, 0xc9} /* hebrew point holam */,
{0x05ba, 0xca} /* hebrew point ???? */,
{0x05bb, 0xcb} /* hebrew point qubuts */,
{0x05bc, 0xcc} /* hebrew point dagesh */,
{0x05bd, 0xcd} /* hebrew point meteg */,
{0x05be, 0xce} /* hebrew punctuation maqaf */,
{0x05bf, 0xcf} /* hebrew point rafe */,
{0x05c0, 0xd0} /* hebrew point paseq */,
{0x05c1, 0xd1} /* hebrew point shin dot */,
{0x05c2, 0xd2} /* hebrew point sin dot */,
{0x05c3, 0xd3} /* hebrew punctuation sof pasuq */,
{0x05f0, 0xd4} /* hebrew ligature yiddish double vav */,
{0x05f1, 0xd5} /* hebrew ligature yiddish vav yod */,
{0x05f2, 0xd6} /* hebrew ligature yiddish double yod */,
{0x05f3, 0xd7} /* hebrew punctuation geresh */,
{0x05f4, 0xd8} /* hebrew punctuation gershayim */,
{0x20aa, 0xa4} /* new sheqel sign */
};
#define cet_ucs4_to_cp1255_extra_ct sizeof(cet_ucs4_to_cp1255_extra) / size
of(cet_ucs4_to_cp1255_extra[0])
cet_cs_vec_t cet_cs_vec_cp1255 = /* defined in cet.h */ cet_cs_vec_t cet_cs_vec_cp1255 = /* defined in cet.h */
{ {
cet_cs_name_cp1255, /* name of character set */ cet_cs_name_cp1255, /* name of character set */
cet_cs_alias_cp1255, /* alias table */ cet_cs_alias_cp1255, /* alias table */
NULL, /* ... to UCS-4 converter (multi-byt e) */ NULL, /* ... to UCS-4 converter (multi-byt e) */
NULL, /* UCS-4 to ... converter (multi-byt e) */ NULL, /* UCS-4 to ... converter (multi-byt e) */
cet_ucs4_map_cp1255, /* char to UCS-4 value table */ cet_ucs4_map_cp1255, /* char to UCS-4 value table */
cet_ucs4_ofs_cp1255, /* first non standard character */ cet_ucs4_ofs_cp1255, /* first non standard character */
cet_ucs4_cnt_cp1255, /* number of values in table */ cet_ucs4_cnt_cp1255, /* number of values in table */
cet_ucs4_to_cp1255_links, /* UCS-4 to char links */ cet_ucs4_to_cp1255_links, /* UCS-4 to char links */
cet_ucs4_to_cp1255_ct, /* number of links */ cet_ucs4_to_cp1255_ct, /* number of links */
NULL, /* hand made UCS-4 links */ cet_ucs4_to_cp1255_extra, /* hand made UCS-4 links */
0, /* number of extra links */ cet_ucs4_to_cp1255_extra_ct, /* number of extra links */
NULL /* for internal use */ NULL /* for internal use */
}; };
/* /*
const int cp1255_ucs4_full_map[] = const int cp1255_ucs4_full_map[] =
{ {
0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
 End of changes. 2 change blocks. 
7 lines changed or deleted 39 lines changed or added


 cp1256.h   cp1256.h 
skipping to change at line 144 skipping to change at line 144
{0x2021, 0x87} /* dagger */, {0x2021, 0x87} /* dagger */,
{0x2022, 0x95} /* puce */, {0x2022, 0x95} /* puce */,
{0x2026, 0x85} /* horizontal ellipsis */, {0x2026, 0x85} /* horizontal ellipsis */,
{0x2039, 0x8b} /* left-pointing angle quotation mark */, {0x2039, 0x8b} /* left-pointing angle quotation mark */,
{0x203a, 0x9b} /* right-pointing angle quotation mark */, {0x203a, 0x9b} /* right-pointing angle quotation mark */,
{0x20ac, 0x80} /* euro */, {0x20ac, 0x80} /* euro */,
{0x2122, 0x99} /* mark sign */, {0x2122, 0x99} /* mark sign */,
{0x3113, 0xd0} /* letter zh */ {0x3113, 0xd0} /* letter zh */
}; };
/* /* Extra table was generated from bestfit1256.txt located at
#define cet_ucs4_to_cp1256_extra_ct 0 ftp.unicode.org:/Public/MAPPINGS/VENDORS/MICSFT/WindowsBestFit/ */
const cet_ucs4_link_t cet_ucs4_to_cp1256_extra[cet_ucs4_to_cp1256_extra_ct]
= {}; const cet_ucs4_link_t cet_ucs4_to_cp1256_extra[] =
*/ {
{0x0152, 0x8c} /* latin capital letter o e */,
{0x0153, 0x9c} /* latin small letter o e */,
{0x0192, 0x83} /* latin small letter script f */,
{0x02c6, 0x88} /* modifier letter circumflex */,
{0x060c, 0xa1} /* arabic comma */,
{0x0638, 0xd9} /* arabic letter dhah */,
{0x0679, 0x8a} /* arabic letter tteh */,
{0x0688, 0x8f} /* arabic letter ddal */,
{0x0691, 0x9a} /* arabic letter rreh */,
{0x06a9, 0x98} /* arabic letter keheh */,
{0x06ba, 0x9f} /* arabic letter noon ghunna */,
{0x06be, 0xaa} /* arabic letter heh doachashmee */,
{0x06c1, 0xc0} /* arabic letter heh goal */,
{0x06cc, 0xed} /* best-fit : farsi yeh -> arabic yeh (u+064a) */,
{0x06d2, 0xff} /* arabic letter yeh barree */,
{0x200c, 0x9d} /* zero width non-joiner */,
{0x200d, 0x9e} /* zero width joiner */,
{0x2030, 0x89} /* per mille sign */
};
#define cet_ucs4_to_cp1256_extra_ct sizeof(cet_ucs4_to_cp1256_extra) / size
of(cet_ucs4_to_cp1256_extra[0])
cet_cs_vec_t cet_cs_vec_cp1256 = /* defined in cet.h */ cet_cs_vec_t cet_cs_vec_cp1256 = /* defined in cet.h */
{ {
cet_cs_name_cp1256, /* name of character set */ cet_cs_name_cp1256, /* name of character set */
cet_cs_alias_cp1256, /* alias table */ cet_cs_alias_cp1256, /* alias table */
NULL, /* ... to UCS-4 converter (multi-byt e) */ NULL, /* ... to UCS-4 converter (multi-byt e) */
NULL, /* UCS-4 to ... converter (multi-byt e) */ NULL, /* UCS-4 to ... converter (multi-byt e) */
cet_ucs4_map_cp1256, /* char to UCS-4 value table */ cet_ucs4_map_cp1256, /* char to UCS-4 value table */
cet_ucs4_ofs_cp1256, /* first non standard character */ cet_ucs4_ofs_cp1256, /* first non standard character */
cet_ucs4_cnt_cp1256, /* number of values in table */ cet_ucs4_cnt_cp1256, /* number of values in table */
cet_ucs4_to_cp1256_links, /* UCS-4 to char links */ cet_ucs4_to_cp1256_links, /* UCS-4 to char links */
cet_ucs4_to_cp1256_ct, /* number of links */ cet_ucs4_to_cp1256_ct, /* number of links */
NULL, /* hand made UCS-4 links */ cet_ucs4_to_cp1256_extra, /* hand made UCS-4 links */
0, /* number of extra links */ cet_ucs4_to_cp1256_extra_ct, /* number of extra links */
NULL /* for internal use */ NULL /* for internal use */
}; };
/* /*
const int cp1256_ucs4_full_map[] = const int cp1256_ucs4_full_map[] =
{ {
0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
 End of changes. 2 change blocks. 
7 lines changed or deleted 29 lines changed or added


 cp1257.h   cp1257.h 
skipping to change at line 132 skipping to change at line 132
{0x2021, 0x87} /* dagger */, {0x2021, 0x87} /* dagger */,
{0x2022, 0x95} /* puce */, {0x2022, 0x95} /* puce */,
{0x2026, 0x85} /* horizontal ellipsis */, {0x2026, 0x85} /* horizontal ellipsis */,
{0x2030, 0x89} /* mille sign */, {0x2030, 0x89} /* mille sign */,
{0x2039, 0x8b} /* left-pointing angle quotation mark */, {0x2039, 0x8b} /* left-pointing angle quotation mark */,
{0x203a, 0x9b} /* right-pointing angle quotation mark */, {0x203a, 0x9b} /* right-pointing angle quotation mark */,
{0x20ac, 0x80} /* euro */, {0x20ac, 0x80} /* euro */,
{0x2122, 0x99} /* mark sign */ {0x2122, 0x99} /* mark sign */
}; };
/* /* Extra table was generated from bestfit1257.txt located at
#define cet_ucs4_to_cp1257_extra_ct 0 ftp.unicode.org:/Public/MAPPINGS/VENDORS/MICSFT/WindowsBestFit/ */
const cet_ucs4_link_t cet_ucs4_to_cp1257_extra[cet_ucs4_to_cp1257_extra_ct]
= {}; const cet_ucs4_link_t cet_ucs4_to_cp1257_extra[] =
*/ {
{0x02c7, 0x8e} /* hacek */,
{0x02d9, 0xff} /* dot above */,
{0x02db, 0x9e} /* ogonek */,
};
#define cet_ucs4_to_cp1257_extra_ct sizeof(cet_ucs4_to_cp1257_extra) / size
of(cet_ucs4_to_cp1257_extra[0])
cet_cs_vec_t cet_cs_vec_cp1257 = /* defined in cet.h */ cet_cs_vec_t cet_cs_vec_cp1257 = /* defined in cet.h */
{ {
cet_cs_name_cp1257, /* name of character set */ cet_cs_name_cp1257, /* name of character set */
cet_cs_alias_cp1257, /* alias table */ cet_cs_alias_cp1257, /* alias table */
NULL, /* ... to UCS-4 converter (multi-byt e) */ NULL, /* ... to UCS-4 converter (multi-byt e) */
NULL, /* UCS-4 to ... converter (multi-byt e) */ NULL, /* UCS-4 to ... converter (multi-byt e) */
cet_ucs4_map_cp1257, /* char to UCS-4 value table */ cet_ucs4_map_cp1257, /* char to UCS-4 value table */
cet_ucs4_ofs_cp1257, /* first non standard character */ cet_ucs4_ofs_cp1257, /* first non standard character */
cet_ucs4_cnt_cp1257, /* number of values in table */ cet_ucs4_cnt_cp1257, /* number of values in table */
cet_ucs4_to_cp1257_links, /* UCS-4 to char links */ cet_ucs4_to_cp1257_links, /* UCS-4 to char links */
cet_ucs4_to_cp1257_ct, /* number of links */ cet_ucs4_to_cp1257_ct, /* number of links */
NULL, /* hand made UCS-4 links */ cet_ucs4_to_cp1257_extra, /* hand made UCS-4 links */
0, /* number of extra links */ cet_ucs4_to_cp1257_extra_ct, /* number of extra links */
NULL /* for internal use */ NULL /* for internal use */
}; };
/* /*
const int cp1257_ucs4_full_map[] = const int cp1257_ucs4_full_map[] =
{ {
0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
 End of changes. 2 change blocks. 
7 lines changed or deleted 14 lines changed or added


 defs.h   defs.h 
/* /*
Copyright (C) 2002, 2003, 2004, 2005 Robert Lipe, robertlipe@usa.net Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Robert Lipe, robertli pe@usa.net
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
skipping to change at line 67 skipping to change at line 67
#define MILES_TO_METERS(a) ((a) * 1609.344) #define MILES_TO_METERS(a) ((a) * 1609.344)
#define METERS_TO_MILES(a) ((a) / 1609.344) #define METERS_TO_MILES(a) ((a) / 1609.344)
#define FATHOMS_TO_METERS(a) ((a) * 1.8288) #define FATHOMS_TO_METERS(a) ((a) * 1.8288)
#define CELSIUS_TO_FAHRENHEIT(a) (((a) * 1.8) + 32) #define CELSIUS_TO_FAHRENHEIT(a) (((a) * 1.8) + 32)
#define FAHRENHEIT_TO_CELSIUS(a) (((a) - 32) / 1.8) #define FAHRENHEIT_TO_CELSIUS(a) (((a) - 32) / 1.8)
#define SECONDS_PER_HOUR (60L*60) #define SECONDS_PER_HOUR (60L*60)
#define SECONDS_PER_DAY (24L*60*60) #define SECONDS_PER_DAY (24L*60*60)
/* meters/second to kilometers/hour */
#define MPS_TO_KPH(a) ((double)(a)*SECONDS_PER_HOUR/1000)
/* meters/second to miles/hour */
#define MPS_TO_MPH(a) (METERS_TO_MILES(a) * SECONDS_PER_HOUR)
/* meters/second to knots */
#define MPS_TO_KNOTS(a) (MPS_TO_KPH((a)/1.852))
/* kilometers/hour to meters/second */
#define KPH_TO_MPS(a) ((double)(a)*1000/SECONDS_PER_HOUR)
/* miles/hour to meters/second */
#define MPH_TO_MPS(a) (MILES_TO_METERS(a) / SECONDS_PER_HOUR)
/* knots to meters/second */
#define KNOTS_TO_MPS(a) (KPH_TO_MPS((a)*1.852))
/* /*
* Snprintf is in SUS (so it's in most UNIX-like substance) and it's in * Snprintf is in SUS (so it's in most UNIX-like substance) and it's in
* C99 (albeit with slightly different semantics) but it isn't in C89. * C99 (albeit with slightly different semantics) but it isn't in C89.
* This tweaks allows us to use snprintf on the holdout. * This tweaks allows us to use snprintf on the holdout.
*/ */
#if __WIN32__ #if __WIN32__
# define snprintf _snprintf # define snprintf _snprintf
# define vsnprintf _vsnprintf # define vsnprintf _vsnprintf
# ifndef fileno # ifndef fileno
# define fileno _fileno # define fileno _fileno
skipping to change at line 221 skipping to change at line 239
typedef struct { typedef struct {
int id; /* The decimal cache number */ int id; /* The decimal cache number */
geocache_type type:5; geocache_type type:5;
geocache_container container:4; geocache_container container:4;
unsigned int diff:6; /* (multiplied by ten internally) */ unsigned int diff:6; /* (multiplied by ten internally) */
unsigned int terr:6; /* (likewise) */ unsigned int terr:6; /* (likewise) */
time_t exported; time_t exported;
time_t last_found; time_t last_found;
char *placer; /* Placer name */ char *placer; /* Placer name */
int placer_id; /* Placer id */
char *hint; /* all these UTF8, XML entities removed, May be not HTML . */ char *hint; /* all these UTF8, XML entities removed, May be not HTML . */
utf_string desc_short; utf_string desc_short;
utf_string desc_long; utf_string desc_long;
} geocache_data ; } geocache_data ;
typedef struct xml_tag { typedef struct xml_tag {
char *tagname; char *tagname;
char *cdata; char *cdata;
int cdatalen; int cdatalen;
char *parentcdata; char *parentcdata;
skipping to change at line 271 skipping to change at line 290
fs_xml *fs_xml_alloc( long type ); fs_xml *fs_xml_alloc( long type );
#define FS_GPX 0x67707800L #define FS_GPX 0x67707800L
#define FS_AN1W 0x616e3177L #define FS_AN1W 0x616e3177L
#define FS_AN1L 0x616e316cL #define FS_AN1L 0x616e316cL
#define FS_AN1V 0x616e3176L #define FS_AN1V 0x616e3176L
#define FS_OZI 0x6f7a6900L #define FS_OZI 0x6f7a6900L
#define FS_GMSD 0x474d5344L /* GMSD = Garmin specific data */ #define FS_GMSD 0x474d5344L /* GMSD = Garmin specific data */
/* /*
* Structures and functions for multiple URLs per waypoint.
*/
typedef struct url_link {
struct url_link *url_next;
char *url;
char *url_link_text;
} url_link;
/*
* Misc bitfields inside struct waypoint; * Misc bitfields inside struct waypoint;
*/ */
typedef struct { typedef struct {
unsigned int icon_descr_is_dynamic:1; unsigned int icon_descr_is_dynamic:1;
unsigned int shortname_is_synthetic:1; unsigned int shortname_is_synthetic:1;
unsigned int cet_converted:1; /* strings are converted to UTF8; interesting only for input */ unsigned int cet_converted:1; /* strings are converted to UTF8; interesting only for input */
/* "flagged fields" */
unsigned int temperature:1; /* temperature field is set
*/
unsigned int proximity:1; /* proximity field is set */
unsigned int course:1; /* course field is set */
unsigned int speed:1; /* speed field is set */
unsigned int depth:1; /* depth field is set */
/* !ToDo!
unsigned int altitude:1; /+ altitude field is set +/
... and others
*/
} wp_flags; } wp_flags;
#define WAYPT_SET(wpt,member,val) { wpt->member = (val); wpt->wpt_flags.mem
ber = 1; }
#define WAYPT_GET(wpt,member,def) (wpt->wpt_flags.member) ? (wpt->member) :
(def)
#define WAYPT_UNSET(wpt,member) wpt->wpt_flags.member = 0
#define WAYPT_HAS(wpt,member) (wpt->wpt_flags.member)
/* /*
* This is a waypoint, as stored in the GPSR. It tries to not * This is a waypoint, as stored in the GPSR. It tries to not
* cater to any specific model or protocol. Anything that needs to * cater to any specific model or protocol. Anything that needs to
* be truncated, edited, or otherwise trimmed should be done on the * be truncated, edited, or otherwise trimmed should be done on the
* way to the target. * way to the target.
*/ */
typedef struct { typedef struct {
queue Q; /* Master waypoint q. Not for use queue Q; /* Master waypoint q. Not for use
by modules. */ by modules. */
skipping to change at line 328 skipping to change at line 371
* These are probably under 40 bytes, but that's only a guideline. * These are probably under 40 bytes, but that's only a guideline.
*/ */
char *description; char *description;
/* /*
* notes are relatively long - over 100 characters - prose associate d * notes are relatively long - over 100 characters - prose associate d
* with the above. Unlike shortname and description, these are nev er * with the above. Unlike shortname and description, these are nev er
* used to compute anything else and are strictly "passed through". * used to compute anything else and are strictly "passed through".
* Few formats support this. * Few formats support this.
*/ */
char *notes; char *notes;
/* This is a bit icky. Multiple waypoint support is an
* afterthought and I don't want to change our data structures.
* So we have the first in the waypoint itself and subsequent
* ones in a linked list.
* We also use an implicit anonymous union here, so these three
* members must match struct url_link...
*/
struct url_link *url_next;
char *url; char *url;
char *url_link_text; char *url_link_text;
wp_flags wpt_flags; wp_flags wpt_flags;
const char *icon_descr; const char *icon_descr;
time_t creation_time; /* standardized in UTC/GMT */ time_t creation_time; /* standardized in UTC/GMT */
int microseconds; /* Optional millionths of a second. */ int microseconds; /* Optional millionths of a second. */
/* /*
* route priority is for use by the simplify filter. If we have * route priority is for use by the simplify filter. If we have
skipping to change at line 403 skipping to change at line 455
int max_hrt; /* Max Heartrate */ int max_hrt; /* Max Heartrate */
int max_cad; /* Max Cadence */ int max_cad; /* Max Cadence */
} computed_trkdata; } computed_trkdata;
/* /*
* Bounding box information. * Bounding box information.
*/ */
typedef struct { typedef struct {
double max_lat; double max_lat;
double max_lon; double max_lon;
double max_alt;
double min_lat; double min_lat;
double min_lon; double min_lon;
double min_alt;
} bounds; } bounds;
typedef struct { typedef struct {
int request_terminate; volatile int request_terminate;
} posn_status; } posn_status;
extern posn_status tracking_status;
typedef void (*ff_init) (char const *); typedef void (*ff_init) (char const *);
typedef void (*ff_deinit) (void); typedef void (*ff_deinit) (void);
typedef void (*ff_read) (void); typedef void (*ff_read) (void);
typedef void (*ff_write) (void); typedef void (*ff_write) (void);
typedef void (*ff_exit) (void); typedef void (*ff_exit) (void);
typedef void (*ff_writeposn) (waypoint *); typedef void (*ff_writeposn) (waypoint *);
typedef waypoint * (*ff_readposn) (posn_status *); typedef waypoint * (*ff_readposn) (posn_status *);
#ifndef DEBUG_MEM #ifndef DEBUG_MEM
char * get_option(const char *iarglist, const char *argname); char * get_option(const char *iarglist, const char *argname);
skipping to change at line 449 skipping to change at line 505
void waypt_free (waypoint *); void waypt_free (waypoint *);
void waypt_disp_all(waypt_cb); void waypt_disp_all(waypt_cb);
void waypt_init_bounds(bounds *bounds); void waypt_init_bounds(bounds *bounds);
int waypt_bounds_valid(bounds *bounds); int waypt_bounds_valid(bounds *bounds);
void waypt_add_to_bounds(bounds *bounds, const waypoint *waypointp); void waypt_add_to_bounds(bounds *bounds, const waypoint *waypointp);
void waypt_compute_bounds(bounds *); void waypt_compute_bounds(bounds *);
void waypt_flush(queue *); void waypt_flush(queue *);
void waypt_flush_all(void); void waypt_flush_all(void);
unsigned int waypt_count(void); unsigned int waypt_count(void);
void set_waypt_count(unsigned int nc); void set_waypt_count(unsigned int nc);
void waypt_add_url(waypoint *wpt, char *link, char *url_link_text);
void free_gpx_extras (xml_tag * tag); void free_gpx_extras (xml_tag * tag);
void xcsv_setup_internal_style(const char *style_buf); void xcsv_setup_internal_style(const char *style_buf);
void xcsv_read_internal_style(const char *style_buf); void xcsv_read_internal_style(const char *style_buf);
waypoint * find_waypt_by_name(const char *name); waypoint * find_waypt_by_name(const char *name);
void waypt_backup(signed int *count, queue **head_bak); void waypt_backup(signed int *count, queue **head_bak);
void waypt_restore(signed int count, queue *head_bak); void waypt_restore(signed int count, queue *head_bak);
route_head *route_head_alloc(void); route_head *route_head_alloc(void);
void route_add (waypoint *); void route_add (waypoint *);
void route_add_wpt(route_head *rte, waypoint *wpt); void route_add_wpt(route_head *rte, waypoint *wpt);
skipping to change at line 641 skipping to change at line 698
typedef struct style_vecs { typedef struct style_vecs {
const char *name; const char *name;
const char *style_buf; const char *style_buf;
} style_vecs_t; } style_vecs_t;
extern style_vecs_t style_list[]; extern style_vecs_t style_list[];
void waypt_init(void); void waypt_init(void);
void route_init(void); void route_init(void);
void waypt_disp(const waypoint *); void waypt_disp(const waypoint *);
void waypt_status_disp(int total_ct, int myct); void waypt_status_disp(int total_ct, int myct);
double waypt_time(const waypoint *wpt);
double waypt_speed(const waypoint *A, const waypoint *B);
NORETURN fatal(const char *, ...) PRINTFLIKE(1, 2); NORETURN fatal(const char *, ...) PRINTFLIKE(1, 2);
void is_fatal(const int condition, const char *, ...) PRINTFLIKE(2, 3); void is_fatal(const int condition, const char *, ...) PRINTFLIKE(2, 3);
void warning(const char *, ...) PRINTFLIKE(1, 2); void warning(const char *, ...) PRINTFLIKE(1, 2);
ff_vecs_t *find_vec(char * const, char **); ff_vecs_t *find_vec(char * const, char **);
void assign_option(const char *vecname, arglist_t *ap, const char *val); void assign_option(const char *vecname, arglist_t *ap, const char *val);
void disp_vec_options(const char *vecname, arglist_t *ap); void disp_vec_options(const char *vecname, arglist_t *ap);
void disp_vecs(void); void disp_vecs(void);
void disp_vec( const char *vecname ); void disp_vec( const char *vecname );
skipping to change at line 708 skipping to change at line 767
#endif /* DEBUG_MEM */ #endif /* DEBUG_MEM */
FILE *xfopen(const char *fname, const char *type, const char *errtxt); FILE *xfopen(const char *fname, const char *type, const char *errtxt);
void xfprintf(const char *errtxt, FILE *stream, const char *format, ...); void xfprintf(const char *errtxt, FILE *stream, const char *format, ...);
void xfputs(const char *errtxt, const char *s, FILE *stream); void xfputs(const char *errtxt, const char *s, FILE *stream);
int case_ignore_strcmp(const char *s1, const char *s2); int case_ignore_strcmp(const char *s1, const char *s2);
int case_ignore_strncmp(const char *s1, const char *s2, int n); int case_ignore_strncmp(const char *s1, const char *s2, int n);
int str_match(const char *str, const char *match); int str_match(const char *str, const char *match);
int case_ignore_str_match(const char *str, const char *match); int case_ignore_str_match(const char *str, const char *match);
char * strenquote(const char *str, const char quot_char);
char *strsub(const char *s, const char *search, const char *replace); char *strsub(const char *s, const char *search, const char *replace);
char *gstrsub(const char *s, const char *search, const char *replace); char *gstrsub(const char *s, const char *search, const char *replace);
char *xstrrstr(const char *s1, const char *s2); char *xstrrstr(const char *s1, const char *s2);
void rtrim(char *s); void rtrim(char *s);
char * lrtrim(char *s); char * lrtrim(char *s);
int xasprintf(char **strp, const char *fmt, ...); int xasprintf(char **strp, const char *fmt, ...);
char *strupper(char *src); char *strupper(char *src);
char *strlower(char *src); char *strlower(char *src);
signed int get_tz_offset(void); signed int get_tz_offset(void);
skipping to change at line 731 skipping to change at line 791
signed int month_lookup(const char *m); signed int month_lookup(const char *m);
const char *get_cache_icon(const waypoint *waypointp); const char *get_cache_icon(const waypoint *waypointp);
const char *gs_get_cachetype(geocache_type t); const char *gs_get_cachetype(geocache_type t);
const char *gs_get_container(geocache_container t); const char *gs_get_container(geocache_container t);
char * xml_entitize(const char * str); char * xml_entitize(const char * str);
char * html_entitize(const char * str); char * html_entitize(const char * str);
char * strip_html(const utf_string*); char * strip_html(const utf_string*);
char * strip_nastyhtml(const char * in); char * strip_nastyhtml(const char * in);
char * convert_human_date_format(const char *human_datef); /* "MM,YYYY, DD" -> "%m,%Y,%d" */ char * convert_human_date_format(const char *human_datef); /* "MM,YYYY, DD" -> "%m,%Y,%d" */
char * convert_human_time_format(const char *human_timef); /* "HH+mm+ss " -> "%H+%M+%S" */ char * convert_human_time_format(const char *human_timef); /* "HH+mm+ss " -> "%H+%M+%S" */
char * pretty_deg_format(double lat, double lon, char fmt, int html); /* decimal -> dd.dddd or dd mm.mmm or dd mm ss */ char * pretty_deg_format(double lat, double lon, char fmt, char *sep, int h tml); /* decimal -> dd.dddd or dd mm.mmm or dd mm ss */
char * get_filename(const char *fname); /* e xtract the filename portion */ char * get_filename(const char *fname); /* e xtract the filename portion */
/* /*
* Character encoding transformations. * Character encoding transformations.
*/ */
#define CET_NOT_CONVERTABLE_DEFAULT '$' #define CET_NOT_CONVERTABLE_DEFAULT '$'
#define CET_CHARSET_ASCII "US-ASCII" #define CET_CHARSET_ASCII "US-ASCII"
#define CET_CHARSET_UTF8 "UTF-8" #define CET_CHARSET_UTF8 "UTF-8"
skipping to change at line 827 skipping to change at line 887
#define pdb_write_double be_write_double #define pdb_write_double be_write_double
#define pdb_read_double be_read_double #define pdb_read_double be_read_double
/* /*
* Prototypes for generic conversion routines (util.c). * Prototypes for generic conversion routines (util.c).
*/ */
double ddmm2degrees(double ddmm_val); double ddmm2degrees(double ddmm_val);
double degrees2ddmm(double deg_val); double degrees2ddmm(double deg_val);
typedef enum {
grid_unknown = -1,
grid_lat_lon_ddd = 0,
grid_lat_lon_dmm = 1,
grid_lat_lon_dms = 2,
grid_bng = 3,
grid_utm = 4
} grid_type;
#define GRID_INDEX_MIN grid_lat_lon_ddd
#define GRID_INDEX_MAX grid_utm
#define DATUM_OSGB36 86
#define DATUM_WGS84 118
int parse_coordinates(const char *str, int datum, const grid_type grid,
double *latitude, double *longitude, const char *module);
/* /*
* From util_crc.c * From util_crc.c
*/ */
unsigned long get_crc32(const void * data, int datalen); unsigned long get_crc32(const void * data, int datalen);
unsigned long get_crc32_s(const void * data); unsigned long get_crc32_s(const void * data);
/* /*
* From units.c * From units.c
*/ */
typedef enum { typedef enum {
skipping to change at line 866 skipping to change at line 944
/* /*
* Color helpers. * Color helpers.
*/ */
int color_to_bbggrr(char *cname); int color_to_bbggrr(char *cname);
/* /*
* A constant for unknown altitude. It's tempting to just use zero * A constant for unknown altitude. It's tempting to just use zero
* but that's not very nice for the folks near sea level. * but that's not very nice for the folks near sea level.
*/ */
#define unknown_alt -99999999.0 #define unknown_alt -99999999.0
#define unknown_course -999.0
#define unknown_speed -999.0
/*
* textfile: buffered OS independent (CRLF,NL,CR) text reader
*/
typedef struct
{
FILE *file_in;
char buf[1024];
char *buf_pos;
char *buf_end;
char *line;
int line_size;
int line_no;
unsigned char tfclose:1;
} textfile_t;
textfile_t *textfile_init(const FILE *file_in);
textfile_t *textfile_open_read(const char *filename, const char *module);
void textfile_done(textfile_t *tf);
char *textfile_read(textfile_t *tf);
int textfile_getc(textfile_t *tf);
#endif /* gpsbabel_defs_h_included */ #endif /* gpsbabel_defs_h_included */
 End of changes. 17 change blocks. 
26 lines changed or deleted 84 lines changed or added


 garmin_fs.h   garmin_fs.h 
skipping to change at line 41 skipping to change at line 41
/* typedef enum { /* typedef enum {
garmin_display_symbol_and_name = 0, garmin_display_symbol_and_name = 0,
garmin_display_symbol_only = 1, garmin_display_symbol_only = 1,
garmin_display_symbol_and_description = 2 garmin_display_symbol_and_description = 2
} garmin_display_t; } garmin_display_t;
*/ */
/* macros */ /* macros */
#define GMSD_FIND(a) (garmin_fs_t *) fs_chain_find((a)->fs, FS_GMSD) #define GMSD_FIND(a) (garmin_fs_t *) fs_chain_find((a)->fs, FS_GMSD)
#define GMSD_HAS(a) (gmsd && gmsd->flags.a)
/* GMSD_GET(a,b): a = any gmsd field, b = default value */ /* GMSD_GET(a,b): a = any gmsd field, b = default value */
#define GMSD_GET(a,b) ((gmsd) && (gmsd->flags.a)) ? (gmsd->a) : (b) #define GMSD_GET(a,b) ((gmsd) && (gmsd->flags.a)) ? (gmsd->a) : (b)
/* GMSD_SET(a,b): a = numeric gmsd field, b = numeric source */ /* GMSD_SET(a,b): a = numeric gmsd field, b = numeric source */
#define GMSD_SET(a,b) if (gmsd) {gmsd->a = (b); gmsd->flags.a = 1; } #define GMSD_SET(a,b) if (gmsd) {gmsd->a = (b); gmsd->flags.a = 1; }
/* GMSD_UNSET(a): a = gmsd field */
#define GMSD_UNSET(a) if (gmsd) { gmsd->flags.a = 0; }
/* GMSD_SETSTR(a,b): a = gmsd field, b = null terminated source */ /* GMSD_SETSTR(a,b): a = gmsd field, b = null terminated source */
#define GMSD_SETSTR(a,b) if (gmsd && (b) && (b)[0]) { gmsd->a = xstrdup((b) ); gmsd->flags.a = 1; } #define GMSD_SETSTR(a,b) if (gmsd && (b) && (b)[0]) { gmsd->a = xstrdup((b) ); gmsd->flags.a = 1; }
/* GMSD_SETNSTR(a,b,c): a = gmsd field, b = source, c = sizeof(source) */ /* GMSD_SETNSTR(a,b,c): a = gmsd field, b = source, c = sizeof(source) */
#define GMSD_SETNSTR(a,b,c) if (gmsd && (b) && (b)[0]) { gmsd->a = xstrndup ((b),(c)); gmsd->flags.a = 1; } #define GMSD_SETNSTR(a,b,c) if (gmsd && (b) && (b)[0]) { gmsd->a = xstrndup ((b),(c)); gmsd->flags.a = 1; }
/* GMSD_GETNSTR(a,b,c): a = gmsd field, b = target, c = sizeof(target) */ /* GMSD_GETNSTR(a,b,c): a = gmsd field, b = target, c = sizeof(target) */
#define GMSD_GETNSTR(a,b,c) if (gmsd && gmsd->flags.a) strncpy((b),gmsd->a, (c)) #define GMSD_GETNSTR(a,b,c) if (gmsd && gmsd->flags.a) strncpy((b),gmsd->a, (c))
typedef struct garmin_ilink_s { typedef struct garmin_ilink_s {
int ref_count; int ref_count;
double lat, lon; double lat, lon, alt;
struct garmin_ilink_s *next; struct garmin_ilink_s *next;
} garmin_ilink_t; } garmin_ilink_t;
typedef struct { typedef struct {
unsigned int icon:1; unsigned int icon:1;
unsigned int wpt_class:1; unsigned int wpt_class:1;
unsigned int display:1; unsigned int display:1;
unsigned int category:1; unsigned int category:1;
unsigned int depth:1;
unsigned int proximity:1;
unsigned int temperature:1;
unsigned int city:1; unsigned int city:1;
unsigned int state:1; unsigned int state:1;
unsigned int facility:1; unsigned int facility:1;
unsigned int cc:1; unsigned int cc:1;
unsigned int cross_road:1; unsigned int cross_road:1;
unsigned int addr:1; unsigned int addr:1;
unsigned int country:1;
unsigned int phone_nr:1;
unsigned int postal_code:1;
#ifdef GMSD_EXPERIMENTAL
unsigned int subclass:1;
#endif
} garmin_fs_flags_t; } garmin_fs_flags_t;
typedef struct garmin_fs_s typedef struct garmin_fs_s
{ {
format_specific_data fs; format_specific_data fs;
garmin_fs_flags_t flags; garmin_fs_flags_t flags;
int protocol; /* ... used by device (-1 is MapSource) */ int protocol; /* ... used by device (-1 is MapSource) */
gbint32 icon; gbint32 icon;
int wpt_class; int wpt_class;
gbint32 display; gbint32 display;
gbint16 category; gbint16 category;
double depth; /* depth in meters */
double proximity; /* proximity distance in meters */
double temperature;
char *city; /* city name */ char *city; /* city name */
char *facility; /* facility name */ char *facility; /* facility name */
char *state; /* state */ char *state; /* state */
char *cc; /* country code */ char *cc; /* country code */
char *cross_road; /* Intersection road label */ char *cross_road; /* Intersection road label */
char *addr; /* address + number */ char *addr; /* address + number */
char *country; /* country */
char *phone_nr; /* phone number */
char *postal_code; /* postal code */
garmin_ilink_t *ilinks; garmin_ilink_t *ilinks;
#ifdef GMSD_EXPERIMENTAL
char subclass[22];
#endif
} garmin_fs_t, *garmin_fs_p; } garmin_fs_t, *garmin_fs_p;
garmin_fs_t *garmin_fs_alloc(const int protocol); garmin_fs_t *garmin_fs_alloc(const int protocol);
void garmin_fs_destroy(void *fs); void garmin_fs_destroy(void *fs);
void garmin_fs_copy(garmin_fs_t **dest, garmin_fs_t *src); void garmin_fs_copy(garmin_fs_t **dest, garmin_fs_t *src);
void garmin_fs_convert(void *fs);
char *garmin_fs_xstrdup(const char *src, size_t size); char *garmin_fs_xstrdup(const char *src, size_t size);
/* for GPX */ /* for GPX */
void garmin_fs_xml_convert(const int base_tag, int tag, const char *cdatast r, waypoint *waypt); void garmin_fs_xml_convert(const int base_tag, int tag, const char *cdatast r, waypoint *waypt);
void garmin_fs_xml_fprint(gbfile *ofd, const waypoint *waypt); void garmin_fs_xml_fprint(gbfile *ofd, const waypoint *waypt);
/* common garmin_fs utilities */ /* common garmin_fs utilities */
/* ..convert_category: returns 1=OK; 0=Unable to convert category */ /* ..convert_category: returns 1=OK; 0=Unable to convert category */
unsigned char garmin_fs_convert_category(const char *category_name, gbuint1 6 *category); unsigned char garmin_fs_convert_category(const char *category_name, gbuint1 6 *category);
 End of changes. 9 change blocks. 
7 lines changed or deleted 18 lines changed or added


 garmin_tables.h   garmin_tables.h 
skipping to change at line 95 skipping to change at line 95
typedef enum { typedef enum {
gt_gdb_display_mode_symbol = 0, gt_gdb_display_mode_symbol = 0,
gt_gdb_display_mode_symbol_and_name, gt_gdb_display_mode_symbol_and_name,
gt_gdb_display_mode_symbol_and_comment gt_gdb_display_mode_symbol_and_comment
} gt_gdb_display_modes_e; } gt_gdb_display_modes_e;
unsigned char gt_convert_category(const char *name, int *category); unsigned char gt_convert_category(const char *name, int *category);
unsigned char gt_switch_display_mode_value(const unsigned char display_mode , const int protoid, const char device); unsigned char gt_switch_display_mode_value(const unsigned char display_mode , const int protoid, const char device);
grid_type gt_lookup_grid_type(const char *grid_name, const char *module);
char *gt_get_mps_grid_longname(const grid_type grid, const char *module);
int gt_lookup_datum_index(const char *datum_str, const char *module);
char *gt_get_mps_datum_name(const int datum_index);
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 lines changed or added


 gbversion.h   gbversion.h 
/* /*
* gbversion.h is generated from gbversion.h.in which uses autoconf voodoo * gbversion.h is generated from gbversion.h.in which uses autoconf voodoo
* to get the version number from configure.in. * to get the version number from configure.in.
* *
* Isn't simplification via automation grand? * Isn't simplification via automation grand?
*/ */
#define VERSION "1.3.3" #define VERSION "1.3.4"
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 lines changed or added


 gps.h   gps.h 
skipping to change at line 90 skipping to change at line 90
float dpth; /* Depth */ float dpth; /* Depth */
float temperature; /* Temperature. Degrees Celsius. */ float temperature; /* Temperature. Degrees Celsius. */
int temperature_populated; /* True if above is valid. */ int temperature_populated; /* True if above is valid. */
unsigned char heartrate; /* Heartrate as in Garmin 301 */ unsigned char heartrate; /* Heartrate as in Garmin 301 */
unsigned char cadence; /* Crank cadence as in Edge 305 */ unsigned char cadence; /* Crank cadence as in Edge 305 */
unsigned int tnew:1; /* New track? */ unsigned int tnew:1; /* New track? */
unsigned int ishdr:1; /* Track header? */ unsigned int ishdr:1; /* Track header? */
unsigned int no_latlon:1; /* True if no valid lat/lon found. * / unsigned int no_latlon:1; /* True if no valid lat/lon found. * /
int32 dspl; /* Display on map? */ int32 dspl; /* Display on map? */
int32 colour; /* Colour */ int32 colour; /* Colour */
float distance; /* distance traveled in meters.*/
char trk_ident[256]; /* Track identifier */ char trk_ident[256]; /* Track identifier */
} }
GPS_OTrack, *GPS_PTrack; GPS_OTrack, *GPS_PTrack;
typedef struct GPS_SAlmanac typedef struct GPS_SAlmanac
{ {
UC svid; UC svid;
int16 wn; int16 wn;
float toa; float toa;
float af0; float af0;
skipping to change at line 157 skipping to change at line 158
char time_populated; /* 1 if true */ char time_populated; /* 1 if true */
time_t time; /* Unix time */ time_t time; /* Unix time */
char temperature_populated; char temperature_populated;
float temperature; /* Degrees celsius. */ float temperature; /* Degrees celsius. */
uint16 category; uint16 category;
} GPS_OWay, *GPS_PWay; } GPS_OWay, *GPS_PWay;
/* /*
* Forerunner Lap data. * Forerunner/Edge Lap data.
*/ */
typedef struct GPS_SLap_Data { typedef struct GPS_SLap {
uint32 index; /* unique index in device or -1 */
time_t start_time; time_t start_time;
uint32 total_time; /* Hundredths of a second */ uint32 total_time; /* Hundredths of a second */
float total_distance; /* In meters */ float total_distance; /* In meters */
double begin_lat; double begin_lat;
double begin_lon; double begin_lon;
double end_lat; double end_lat;
double end_lon; double end_lon;
int16 calories; int16 calories;
UC track_index; uint32 track_index; /* ref to track or -1 */
} GPS_OLap_Data, *GPS_PLap_Data; float max_speed; /* In meters per second */
unsigned char avg_heart_rate; /* In beats-per-minute, 0 if invalid *
/
unsigned char max_heart_rate; /* In beats-per-minute, 0 if invalid *
/
unsigned char intensity; /* Same as D1001 */
unsigned char avg_cadence; /* In revolutions-per-minute, 0xFF if inv
alid */
unsigned char trigger_method;
/*Some D1015 unknown */
/* unsigned char unk1015_1;
int16 unk1015_2;
int16 unk1015_3;
*/
} GPS_OLap, *GPS_PLap;
typedef int (*pcb_fn) (int, struct GPS_SWay **); typedef int (*pcb_fn) (int, struct GPS_SWay **);
#include "gpsdevice.h" #include "gpsdevice.h"
#include "gpssend.h" #include "gpssend.h"
#include "gpsread.h" #include "gpsread.h"
#include "gpsutil.h" #include "gpsutil.h"
#include "gpsapp.h" #include "gpsapp.h"
#include "gpsprot.h" #include "gpsprot.h"
#include "gpscom.h" #include "gpscom.h"
 End of changes. 4 change blocks. 
4 lines changed or deleted 20 lines changed or added


 gpsapp.h   gpsapp.h 
skipping to change at line 25 skipping to change at line 25
int32 GPS_A100_Send(const char *port, GPS_PWay *way, int32 n, int (*cb)(GP S_PWay *)); int32 GPS_A100_Send(const char *port, GPS_PWay *way, int32 n, int (*cb)(GP S_PWay *));
int32 GPS_A200_Get(const char *port, GPS_PWay **way); int32 GPS_A200_Get(const char *port, GPS_PWay **way);
int32 GPS_A201_Get(const char *port, GPS_PWay **way); int32 GPS_A201_Get(const char *port, GPS_PWay **way);
int32 GPS_A200_Send(const char *port, GPS_PWay *way, int32 n); int32 GPS_A200_Send(const char *port, GPS_PWay *way, int32 n);
int32 GPS_A201_Send(const char *port, GPS_PWay *way, int32 n); int32 GPS_A201_Send(const char *port, GPS_PWay *way, int32 n);
int32 GPS_A300_Get(const char *port, GPS_PTrack **trk, pcb_fn cb); int32 GPS_A300_Get(const char *port, GPS_PTrack **trk, pcb_fn cb);
int32 GPS_A301_Get(const char *port, GPS_PTrack **trk, pcb_fn cb); int32 GPS_A301_Get(const char *port, GPS_PTrack **trk, pcb_fn cb);
int32 GPS_A300_Send(const char *port, GPS_PTrack *trk, int32 n); int32 GPS_A300_Send(const char *port, GPS_PTrack *trk, int32 n);
int32 GPS_A301_Send(const char *port, GPS_PTrack *trk, int32 n); int32 GPS_A301_Send(const char *port, GPS_PTrack *trk, int32 n); /*A302*/
int32 GPS_D300_Get(GPS_PTrack *trk, int32 entries, gpsdevh *h); int32 GPS_D300_Get(GPS_PTrack *trk, int32 entries, gpsdevh *h);
void GPS_D300b_Get(GPS_PTrack *trk, UC *data); void GPS_D300b_Get(GPS_PTrack *trk, UC *data);
void GPS_D301b_Get(GPS_PTrack *trk, UC *data); void GPS_D301b_Get(GPS_PTrack *trk, UC *data);
void GPS_D302b_Get(GPS_PTrack *trk, UC *data); void GPS_D302b_Get(GPS_PTrack *trk, UC *data);
void GPS_D303b_Get(GPS_PTrack *trk, UC *data); void GPS_D303b_Get(GPS_PTrack *trk, UC *data); /*D304*/
void GPS_D310_Get(GPS_PTrack *trk, UC *s); void GPS_D310_Get(GPS_PTrack *trk, UC *s);
void GPS_D311_Get(GPS_PTrack *trk, UC *s); void GPS_D311_Get(GPS_PTrack *trk, UC *s);
void GPS_D300_Send(UC *data, GPS_PTrack trk); void GPS_D300_Send(UC *data, GPS_PTrack trk);
void GPS_D301_Send(UC *data, GPS_PTrack trk); void GPS_D301_Send(UC *data, GPS_PTrack trk);
void GPS_D304_Send(UC *data, GPS_PTrack trk); void GPS_D304_Send(UC *data, GPS_PTrack trk);
void GPS_D310_Send(UC *data, GPS_PTrack trk, int32 *len); void GPS_D310_Send(UC *data, GPS_PTrack trk, int32 *len);
int32 GPS_A400_Get(const char *port, GPS_PWay **way); int32 GPS_A400_Get(const char *port, GPS_PWay **way);
int32 GPS_A400_Send(const char *port, GPS_PWay *way, int32 n); int32 GPS_A400_Send(const char *port, GPS_PWay *way, int32 n);
skipping to change at line 60 skipping to change at line 60
int32 GPS_A700_Get(const char *port, double *lat, double *lon); int32 GPS_A700_Get(const char *port, double *lat, double *lon);
int32 GPS_A700_Send(const char *port, double lat, double lon); int32 GPS_A700_Send(const char *port, double lat, double lon);
void GPS_D700_Get(GPS_PPacket packet, double *lat, double *lon); void GPS_D700_Get(GPS_PPacket packet, double *lat, double *lon);
void GPS_D700_Send(GPS_PPacket *packet, double lat, double lon); void GPS_D700_Send(GPS_PPacket *packet, double lat, double lon);
int32 GPS_A800_On(const char *port, gpsdevh **fd); int32 GPS_A800_On(const char *port, gpsdevh **fd);
int32 GPS_A800_Off(const char *port, gpsdevh **fd); int32 GPS_A800_Off(const char *port, gpsdevh **fd);
int32 GPS_A800_Get(gpsdevh **fd, GPS_PPvt_Data *packet); int32 GPS_A800_Get(gpsdevh **fd, GPS_PPvt_Data *packet);
void GPS_D800_Get(GPS_PPacket packet, GPS_PPvt_Data *pvt); void GPS_D800_Get(GPS_PPacket packet, GPS_PPvt_Data *pvt);
int32 GPS_A906_Get(const char *port, GPS_PLap **lap, pcb_fn cb);
void GPS_D1011b_Get(GPS_PLap *Lap,UC *data); /*D906 D1001 D1015*/
/* Unhandled documented protocols, as of:
Garmin Device Interface Specification, May 19, 2006, Drawing Number: 001-
00063-00 Rev. C
A650
A1000
Capability A1000: D1009
D1000 D1010
A1002
Capability A1002: D1008
D1002
Capability A1003: D1003
A1004
Capability A1004: D1004
A1005
Capability A1005: D1005
A1006
Capability A1006: D1006
Capability A1007: D1007
Capability A1008: D1012
A1009
Capability A1009: D1013
*/
/* Unimplemted and Undocumented, as listed from the following device/sw:
GF305 3.70
Capability A601: D601
Capability A801: D801
Capability A902:
Capability A903:
Capability A907: D907 D908 D909 D910
Capability A918: D918
Capability A1013: D1014
*/
const char * Get_Pkt_Type(unsigned char p, unsigned short d0, const char ** xinfo); const char * Get_Pkt_Type(unsigned char p, unsigned short d0, const char ** xinfo);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 End of changes. 3 change blocks. 
2 lines changed or deleted 40 lines changed or added


 gpscom.h   gpscom.h 
skipping to change at line 39 skipping to change at line 39
int32 GPS_Command_Get_Waypoint(const char *port, GPS_PWay **way,int (*cb)( int, struct GPS_SWay **)); int32 GPS_Command_Get_Waypoint(const char *port, GPS_PWay **way,int (*cb)( int, struct GPS_SWay **));
int32 GPS_Command_Send_Waypoint(const char *port, GPS_PWay *way, int32 n, int (*cb)(struct GPS_SWay **)); int32 GPS_Command_Send_Waypoint(const char *port, GPS_PWay *way, int32 n, int (*cb)(struct GPS_SWay **));
int32 GPS_Command_Get_Proximity(const char *port, GPS_PWay **way); int32 GPS_Command_Get_Proximity(const char *port, GPS_PWay **way);
int32 GPS_Command_Send_Proximity(const char *port, GPS_PWay *way, int32 n) ; int32 GPS_Command_Send_Proximity(const char *port, GPS_PWay *way, int32 n) ;
int32 GPS_Command_Get_Route(const char *port, GPS_PWay **way); int32 GPS_Command_Get_Route(const char *port, GPS_PWay **way);
int32 GPS_Command_Send_Route(const char *port, GPS_PWay *way, int32 n); int32 GPS_Command_Send_Route(const char *port, GPS_PWay *way, int32 n);
int32 GPS_Command_Get_Lap(const char *port, GPS_PLap **lap, int (*cb)(int,
struct GPS_SWay **));
int32 GPS_Command_Get_Workout(const char *port, void **lap, int (*cb)(int,
struct GPS_SWay **));
int32 GPS_Command_Get_Fitness_User_Profile(const char *port, void **lap, i
nt (*cb)(int, struct GPS_SWay **));
int32 GPS_Command_Get_Workout_Limits(const char *port, void **lap, int (*c
b)(int, struct GPS_SWay **));
int32 GPS_Command_Get_Course(const char *port, void **lap, int (*cb)(int,
struct GPS_SWay **));
int32 GPS_Command_Get_Course_Limits(const char *port, void **lap, int (*cb
)(int, struct GPS_SWay **));
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 13 lines changed or added


 gpsmath.h   gpsmath.h 
skipping to change at line 114 skipping to change at line 114
int32 GPS_Math_NAD83_To_UTM_EN(double lat, double lon, double *E, int32 GPS_Math_NAD83_To_UTM_EN(double lat, double lon, double *E,
double *N, int32 *zone, char *zc); double *N, int32 *zone, char *zc);
int32 GPS_Math_WGS84_To_UTM_EN(double lat, double lon, double *E, int32 GPS_Math_WGS84_To_UTM_EN(double lat, double lon, double *E,
double *N, int32 *zone, char *zc); double *N, int32 *zone, char *zc);
int32 GPS_Math_UTM_EN_To_WGS84(double *lat, double *lon, double E, int32 GPS_Math_UTM_EN_To_WGS84(double *lat, double *lon, double E,
double N, int32 zone, char zc); double N, int32 zone, char zc);
int32 GPS_Math_UTM_EN_To_NAD83(double *lat, double *lon, double E, int32 GPS_Math_UTM_EN_To_NAD83(double *lat, double *lon, double E,
double N, int32 zone, char zc); double N, int32 zone, char zc);
int32 GPS_Math_Known_Datum_To_UTM_EN(double lat, double lon, double *E,
double *N, int32 *zone, char *zc, const int n
);
int32 GPS_Math_UTM_EN_To_Known_Datum(double *lat, double *lon, double E,
double N, int32 zone, char zc, const int n);
int32 GPS_Lookup_Datum_Index(const char *n); int32 GPS_Lookup_Datum_Index(const char *n);
char *GPS_Math_Get_Datum_Name(const int datum_index);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 7 lines changed or added


 gpsmem.h   gpsmem.h 
skipping to change at line 21 skipping to change at line 21
GPS_PPacket GPS_Packet_New(void); GPS_PPacket GPS_Packet_New(void);
void GPS_Packet_Del(GPS_PPacket *thys); void GPS_Packet_Del(GPS_PPacket *thys);
GPS_PPvt_Data GPS_Pvt_New(void); GPS_PPvt_Data GPS_Pvt_New(void);
void GPS_Pvt_Del(GPS_PPvt_Data *thys); void GPS_Pvt_Del(GPS_PPvt_Data *thys);
GPS_PAlmanac GPS_Almanac_New(void); GPS_PAlmanac GPS_Almanac_New(void);
void GPS_Almanac_Del(GPS_PAlmanac *thys); void GPS_Almanac_Del(GPS_PAlmanac *thys);
GPS_PTrack GPS_Track_New(void); GPS_PTrack GPS_Track_New(void);
void GPS_Track_Del(GPS_PTrack *thys); void GPS_Track_Del(GPS_PTrack *thys);
GPS_PWay GPS_Way_New(void); GPS_PWay GPS_Way_New(void);
void GPS_Way_Del(GPS_PWay *thys); void GPS_Way_Del(GPS_PWay *thys);
GPS_PLap GPS_Lap_New(void);
void GPS_Lap_Del(GPS_PLap *thys);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 gpsprot.h   gpsprot.h 
skipping to change at line 17 skipping to change at line 17
#define gpsprotocols_h #define gpsprotocols_h
#include "gps.h" #include "gps.h"
/* /*
* Link protocols * Link protocols
*/ */
struct LINKDATA struct LINKDATA
{ {
UC Pid_Ack_Byte; US Pid_Protocol_Array;
UC Pid_Command_Data; US Pid_Product_Rqst;
UC Pid_Xfer_Cmplt; US Pid_Product_Data;
UC Pid_Date_Time_Data; US Pid_Ext_Product_Data;
UC Pid_Position_Data;
UC Pid_Prx_Wpt_Data; US Pid_Ack_Byte;
UC Pid_Nak_Byte; US Pid_Command_Data;
UC Pid_Records; US Pid_Xfer_Cmplt;
UC Pid_Rte_Hdr; US Pid_Date_Time_Data;
UC Pid_Rte_Wpt_Data; US Pid_Position_Data;
UC Pid_Almanac_Data; US Pid_Prx_Wpt_Data;
UC Pid_Trk_Data; US Pid_Nak_Byte;
UC Pid_Wpt_Data; US Pid_Records;
UC Pid_Pvt_Data; US Pid_Rte_Hdr;
UC Pid_Rte_Link_Data; US Pid_Rte_Wpt_Data;
UC Pid_Trk_Hdr; US Pid_Almanac_Data;
UC Pid_Protocol_Array; US Pid_Trk_Data;
UC Pid_Product_Rqst; US Pid_Wpt_Data;
UC Pid_Product_Data; US Pid_Pvt_Data;
UC Pid_Wpt_Cat_Data; US Pid_Rte_Link_Data;
} US Pid_Trk_Hdr;
;
US Pid_FlightBook_Record;
US Pid_Lap;
US Pid_Wpt_Cat_Data;
US Pid_Run;
US Pid_Workout;
US Pid_Workout_Occurrence;
US Pid_Fitness_User_Profile;
US Pid_Workout_Limits;
US Pid_Course;
US Pid_Course_Lap;
US Pid_Course_Point;
US Pid_Course_Trk_Hdr;
US Pid_Course_Trk_Data;
US Pid_Course_Limits;
US Pid_Trk2_Hdr; /*Undocumented*/
};
/* /*
* Command types * Command types
*/ */
#define pA010 10 #define pA010 10
#define pA011 11 #define pA011 11
int32 gps_device_command; int32 gps_device_command;
skipping to change at line 66 skipping to change at line 82
US Cmnd_Transfer_Time; US Cmnd_Transfer_Time;
US Cmnd_Transfer_Trk; US Cmnd_Transfer_Trk;
US Cmnd_Transfer_Wpt; US Cmnd_Transfer_Wpt;
US Cmnd_Turn_Off_Pwr; US Cmnd_Turn_Off_Pwr;
US Cmnd_Start_Pvt_Data; US Cmnd_Start_Pvt_Data;
US Cmnd_Stop_Pvt_Data; US Cmnd_Stop_Pvt_Data;
US Cmnd_FlightBook_Transfer; US Cmnd_FlightBook_Transfer;
US Cmnd_Transfer_Lap; US Cmnd_Transfer_Lap;
US Cmnd_Transfer_Wpt_Cats; US Cmnd_Transfer_Wpt_Cats;
US Cmnd_Transfer_Runs; US Cmnd_Transfer_Runs;
US Cmnd_Transfer_Workouts;
US Cmnd_Transfer_Workout_Occurrences;
US Cmnd_Transfer_Fitness_User_Profile;
US Cmnd_Transfer_Workout_Limits;
US Cmnd_Transfer_Courses;
US Cmnd_Transfer_Course_Laps;
US Cmnd_Transfer_Course_Points;
US Cmnd_Transfer_Course_Tracks;
US Cmnd_Transfer_Course_Limits;
} }
; ;
/* /*
* Waypoint Transfer Protocol * Waypoint Transfer Protocol
*/ */
#define pA100 100 #define pA100 100
int32 gps_waypt_transfer; int32 gps_waypt_transfer;
/* /*
skipping to change at line 116 skipping to change at line 141
#define pA500 500 #define pA500 500
int32 gps_almanac_transfer; int32 gps_almanac_transfer;
/* /*
* Date Time Transfer * Date Time Transfer
*/ */
#define pA600 600 #define pA600 600
int32 gps_date_time_transfer; int32 gps_date_time_transfer;
/* /*
* FlightBook Transfer Protocol
*/
#define pA650 650
/*Not implemented */
/*
* Position * Position
*/ */
#define pA700 700 #define pA700 700
int32 gps_position_transfer; int32 gps_position_transfer;
/* /*
* Pvt * Pvt
*/ */
#define pA800 800 #define pA800 800
int32 gps_pvt_transfer; int32 gps_pvt_transfer;
/* /*
* Lap Data Transfer * Lap Data Transfer
*/ */
#define pA906 906 #define pA906 906
int32 gps_lap_transfer; int32 gps_lap_transfer;
/*
* Various fitness related
*/
#define pA1000 1000 #define pA1000 1000
int32 gps_run_transfer; int32 gps_run_transfer;
#define pA1002 1002
int32 gps_workout_transfer;
#define pA1004 1004
int32 gps_user_profile_transfer;
#define pA1005 1005
int32 gps_workout_limits_transfer;
#define pA1006 1006
int32 gps_course_transfer;
#define pA1009 1009
int32 gps_course_limits_transfer;
/* /*
* Waypoint D Type * Waypoint D Type
*/ */
#define pD100 100 #define pD100 100
#define pD101 101 #define pD101 101
#define pD102 102 #define pD102 102
#define pD103 103 #define pD103 103
#define pD104 104 #define pD104 104
#define pD105 105 #define pD105 105
skipping to change at line 241 skipping to change at line 285
* Pvt Data Type * Pvt Data Type
*/ */
#define pD800 800 #define pD800 800
int32 gps_pvt_type; int32 gps_pvt_type;
/* /*
* Lap Data Type * Lap Data Type
*/ */
#define pD906 906 #define pD906 906
#define pD1001 1001
#define pD1011 1011
#define pD1015 1015
int32 gps_lap_type; int32 gps_lap_type;
/* /*
* Various fitness related
*/
#define pD1000 1000
#define pD1009 1009
#define pD1010 1010
int32 gps_run_type;
#define pD1002 1002
#define pD1008 1008
int32 gps_workout_type;
#define pD1003 1003
int32 gps_workout_occurrence_type;
#define pD1004 1004
int32 gps_user_profile_type;
#define pD1005 1005
int32 gps_workout_limits_type;
#define pD1006 1006
int32 gps_course_type;
#define pD1007 1007
int32 gps_course_lap_type;
#define pD1012 1012
int32 gps_course_point_type;
#define pD1013 1013
int32 gps_course_limits_type;
/*
* Link protocol type * Link protocol type
*/ */
#define pL000 0 #define pL000 0
#define pL001 1 #define pL001 1
#define pL002 2 #define pL002 2
int32 gps_link_type; int32 gps_link_type;
struct GPS_MODEL_PROTOCOL struct GPS_MODEL_PROTOCOL
{ {
 End of changes. 7 change blocks. 
22 lines changed or deleted 94 lines changed or added


 quovadis.h   quovadis.h 
skipping to change at line 25 skipping to change at line 25
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA
*/ */
#ifndef __quovadis_h__ #ifndef __quovadis_h__
#define __quovadis_h__ #define __quovadis_h__
#include "defs.h" #include "defs.h"
#include "coldsync/palm.h" #include "pdbfile.h"
#include "coldsync/pdb.h"
#define MYNAME "QuoVadis" #define MYNAME "QuoVadis"
#define MYTYPE 0x51564D52 /* QVMR */ #define MYTYPE 0x51564D52 /* QVMR */
#define MYCREATOR 0x51554F56 /* QUOV */ #define MYCREATOR 0x51554F56 /* QUOV */
#define MAXCHUNKSIZE 0x10000 /* 64k Chunk max */ #define MAXCHUNKSIZE 0x10000 /* 64k Chunk max */
struct record { struct record {
char name[32]; char name[32];
pdb_32 longitude; /* Scaled. (degrees + 180.0) * 1e6 */ pdb_32 longitude; /* Scaled. (degrees + 180.0) * 1e6 */
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 xmlgeneric.h   xmlgeneric.h 
skipping to change at line 36 skipping to change at line 36
} xg_cb_type; } xg_cb_type;
typedef void (xg_callback) (const char *, const char **); typedef void (xg_callback) (const char *, const char **);
typedef struct xg_tag_mapping { typedef struct xg_tag_mapping {
xg_callback *tag_cb; xg_callback *tag_cb;
xg_cb_type cb_type; xg_cb_type cb_type;
const char *tag_name; const char *tag_name;
} xg_tag_mapping; } xg_tag_mapping;
extern char *xhtml_entities;
void write_xml_entity(gbfile *ofd, const char *indent, void write_xml_entity(gbfile *ofd, const char *indent,
const char *tag, const char *value); const char *tag, const char *value);
void write_xml_entity_begin0(gbfile *ofd, const char *indent, void write_xml_entity_begin0(gbfile *ofd, const char *indent,
const char *tag); const char *tag);
void write_xml_entity_begin1(gbfile *ofd, const char *indent, const char *t ag, void write_xml_entity_begin1(gbfile *ofd, const char *indent, const char *t ag,
const char *attr1, const char *attrval1); const char *attr1, const char *attrval1);
void write_xml_entity_begin2(gbfile *ofd, const char *indent, const char *t ag, void write_xml_entity_begin2(gbfile *ofd, const char *indent, const char *t ag,
const char *attr1, const char *attrval1, const char *attr1, const char *attrval1,
const char *attr2, const char *attrval2); const char *attr2, const char *attrval2);
void write_xml_entity_end(gbfile *ofd, const char *indent, const char *tag) ; void write_xml_entity_end(gbfile *ofd, const char *indent, const char *tag) ;
skipping to change at line 58 skipping to change at line 60
const char *tag, const char *value); const char *tag, const char *value);
void xml_write_time(gbfile *ofd, const time_t timep, int microseconds, char *elname); void xml_write_time(gbfile *ofd, const time_t timep, int microseconds, char *elname);
void xml_fill_in_time(char *time_string, const time_t timep, int microsecon ds, void xml_fill_in_time(char *time_string, const time_t timep, int microsecon ds,
int long_or_short); int long_or_short);
void write_xml_header(gbfile *ofd); void write_xml_header(gbfile *ofd);
void xml_ignore_tags(const char **taglist); void xml_ignore_tags(const char **taglist);
void xml_init(const char *fname, xg_tag_mapping *tbl,const char *encoding); void xml_init(const char *fname, xg_tag_mapping *tbl,const char *encoding);
void xml_read(void); void xml_read(void);
void xml_readstring(char *str); void xml_readstring(char *str);
void xml_readprefixstring(char *str);
void xml_deinit(void); void xml_deinit(void);
 End of changes. 2 change blocks. 
0 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/