diff --git a/iup/src/iup_str.c b/iup/src/iup_str.c index 0f2d313..fb1e08d 100644 --- a/iup/src/iup_str.c +++ b/iup/src/iup_str.c @@ -1224,44 +1224,44 @@ static void iStrInitLatin1_map(void) /* these characters are sorted in the same order as Excel would sort them */ - mm( 0)= 0; mm( 1)= 1; mm( 2)= 2; mm( 3)= 3; mm( 4)= 4; mm( 5)= 5; mm( 6)= 6; mm( 7)= 7; mm( 8)= 8; mm( 9)= 9; mm( 10)= 10; mm( 11)= 11; mm( 12)= 12; mm( 13)= 13; mm( 14)= 14; mm( 15)= 15; - mm( 16)= 16; mm( 17)= 17; mm( 18)= 18; mm( 19)= 19; mm( 20)= 20; mm( 21)= 21; mm( 22)= 22; mm( 23)= 23; mm( 24)= 24; mm( 25)= 25; mm( 26)= 26; mm( 27)= 27; mm( 28)= 28; mm( 29)= 29; mm( 30)= 30; mm( 31)= 31; - mm('\'')= 32; mm('-')= 33; mm('–')= 34; mm('—')= 35; mm(' ')= 36; mm('!')= 37; mm('"')= 38; mm('#')= 39; mm('$')= 40; mm('%')= 41; mm('&')= 42; mm('(')= 43; mm(')')= 44; mm('*')= 45; mm(',')= 46; mm('.')= 47; - mm('/')= 48; mm(':')= 49; mm(';')= 50; mm('?')= 51; mm('@')= 52; mm('(')= 53; mm(')')= 54; mm('^')= 55; mm('ˆ')= 56; mm('_')= 57; mm('`')= 58; mm('{')= 59; mm('|')= 60; mm('}')= 61; mm('~')= 62; mm('¡')= 63; - mm('¦')= 64; mm('¨')= 65; mm('¯')= 66; mm('´')= 67; mm('¸')= 68; mm('¿')= 69; mm('˜')= 70; mm('‘')= 71; mm('’')= 72; mm('‚')= 73; mm('“')= 74; mm('”')= 75; mm('„')= 76; mm('‹')= 77; mm('›')= 78; mm('¢')= 79; - mm('£')= 80; mm('¤')= 81; mm('¥')= 82; mm('€')= 83; mm('+')= 84; mm('<')= 85; mm('=')= 86; mm('>')= 87; mm('±')= 88; mm('«')= 89; mm('»')= 90; mm('×')= 91; mm('÷')= 92; mm('§')= 93; mm('©')= 94; mm('¬')= 95; - mm('®')= 96; mm('°')= 97; mm('µ')= 98; mm('¶')= 99; mm('…')=100; mm('†')=101; mm('‡')=102; mm('•')=103; mm('•')=104; mm('‰')=105; mm('0')=106; mm('¼')=107; mm('½')=108; mm('¾')=109; mm('1')=110; mm('¹')=111; - mm('2')=112; mm('²')=113; mm('3')=114; mm('³')=115; mm('4')=116; mm('5')=117; mm('6')=118; mm('7')=119; mm('8')=120; mm('9')=121; mm('a')=122; mm('A')=123; mm('ª')=124; mm('á')=125; mm('Á')=126; mm('à')=127; - mm('À')=128; mm('â')=129; mm('Â')=130; mm('ä')=131; mm('Ä')=132; mm('ã')=133; mm('Ã')=134; mm('å')=135; mm('Å')=136; mm('æ')=137; mm('Æ')=138; mm('b')=139; mm('B')=140; mm('c')=141; mm('C')=142; mm('ç')=143; - mm('Ç')=144; mm('d')=145; mm('D')=146; mm('ð')=147; mm('Ð')=148; mm('e')=149; mm('E')=150; mm('é')=151; mm('É')=152; mm('è')=153; mm('È')=154; mm('ê')=155; mm('Ê')=156; mm('ë')=157; mm('Ë')=158; mm('f')=159; - mm('F')=160; mm('ƒ')=161; mm('g')=162; mm('G')=163; mm('h')=164; mm('H')=165; mm('i')=166; mm('I')=167; mm('í')=168; mm('Í')=169; mm('ì')=170; mm('Ì')=171; mm('î')=172; mm('Î')=173; mm('ï')=174; mm('Ï')=175; - mm('j')=176; mm('J')=177; mm('k')=178; mm('K')=179; mm('l')=180; mm('L')=181; mm('m')=182; mm('M')=183; mm('n')=184; mm('N')=185; mm('ñ')=186; mm('Ñ')=187; mm('o')=188; mm('O')=189; mm('º')=190; mm('ó')=191; - mm('Ó')=192; mm('ò')=193; mm('Ò')=194; mm('ô')=195; mm('Ô')=196; mm('ö')=197; mm('Ö')=198; mm('õ')=199; mm('Õ')=200; mm('ø')=201; mm('Ø')=202; mm('œ')=203; mm('Œ')=204; mm('p')=205; mm('P')=206; mm('q')=207; - mm('Q')=208; mm('r')=209; mm('R')=210; mm('s')=211; mm('S')=212; mm('š')=213; mm('Š')=214; mm('ß')=215; mm('t')=216; mm('T')=217; mm('þ')=218; mm('Þ')=219; mm('™')=220; mm('u')=221; mm('U')=222; mm('ú')=223; - mm('Ú')=224; mm('ù')=225; mm('Ù')=226; mm('û')=227; mm('Û')=228; mm('ü')=229; mm('Ü')=230; mm('v')=231; mm('V')=232; mm('w')=233; mm('W')=234; mm('x')=235; mm('X')=236; mm('y')=237; mm('Y')=238; mm('ý')=239; - mm('Ý')=240; mm('ÿ')=241; mm('Ÿ')=242; mm('z')=243; mm('Z')=244; mm('ž')=245; mm('Ž')=246; mm('\\')=247; mm(127)=248; mm(129)=249; mm(141)=250; mm(143)=251; mm(144)=252; mm(157)=253; mm(160)=254; mm(173)=255; + mm( 0)= 0; mm( 1)= 1; mm( 2)= 2; mm( 3)= 3; mm( 4)= 4; mm( 5)= 5; mm( 6)= 6; mm( 7)= 7; mm( 8)= 8; mm( 9)= 9; mm( 10)= 10; mm( 11)= 11; mm( 12)= 12; mm( 13)= 13; mm( 14)= 14; mm( 15)= 15; + mm( 16)= 16; mm( 17)= 17; mm( 18)= 18; mm( 19)= 19; mm( 20)= 20; mm( 21)= 21; mm( 22)= 22; mm( 23)= 23; mm( 24)= 24; mm( 25)= 25; mm( 26)= 26; mm( 27)= 27; mm( 28)= 28; mm( 29)= 29; mm( 30)= 30; mm( 31)= 31; + mm('\'')= 32; mm('-')= 33; mm(150)= 34; mm(151)= 35; mm(' ')= 36; mm('!')= 37; mm('"')= 38; mm('#')= 39; mm('$')= 40; mm('%')= 41; mm('&')= 42; mm('(')= 43; mm(')')= 44; mm('*')= 45; mm(',')= 46; mm('.')= 47; + mm('/')= 48; mm(':')= 49; mm(';')= 50; mm('?')= 51; mm('@')= 52; mm('(')= 53; mm(')')= 54; mm('^')= 55; mm(136)= 56; mm('_')= 57; mm('`')= 58; mm('{')= 59; mm('|')= 60; mm('}')= 61; mm('~')= 62; mm(161)= 63; + mm(166)= 64; mm(168)= 65; mm(175)= 66; mm(180)= 67; mm(184)= 68; mm(191)= 69; mm(152)= 70; mm(145)= 71; mm(146)= 72; mm(130)= 73; mm(147)= 74; mm(148)= 75; mm(132)= 76; mm(139)= 77; mm(155)= 78; mm(162)= 79; + mm(163)= 80; mm(164)= 81; mm(165)= 82; mm(128)= 83; mm('+')= 84; mm('<')= 85; mm('=')= 86; mm('>')= 87; mm(177)= 88; mm(171)= 89; mm(187)= 90; mm(215)= 91; mm(247)= 92; mm(167)= 93; mm(169)= 94; mm(172)= 95; + mm(174)= 96; mm(176)= 97; mm(181)= 98; mm(182)= 99; mm(133)=100; mm(134)=101; mm(135)=102; mm(149)=103; mm(149)=104; mm(137)=105; mm('0')=106; mm(188)=107; mm(189)=108; mm(190)=109; mm('1')=110; mm(185)=111; + mm('2')=112; mm(178)=113; mm('3')=114; mm(179)=115; mm('4')=116; mm('5')=117; mm('6')=118; mm('7')=119; mm('8')=120; mm('9')=121; mm('a')=122; mm('A')=123; mm(170)=124; mm(225)=125; mm(193)=126; mm(224)=127; + mm(192)=128; mm(226)=129; mm(194)=130; mm(228)=131; mm(196)=132; mm(227)=133; mm(195)=134; mm(229)=135; mm(197)=136; mm(230)=137; mm(198)=138; mm('b')=139; mm('B')=140; mm('c')=141; mm('C')=142; mm(231)=143; + mm(199)=144; mm('d')=145; mm('D')=146; mm(240)=147; mm(208)=148; mm('e')=149; mm('E')=150; mm(233)=151; mm(201)=152; mm(232)=153; mm(200)=154; mm(234)=155; mm(202)=156; mm(235)=157; mm(203)=158; mm('f')=159; + mm('F')=160; mm(131)=161; mm('g')=162; mm('G')=163; mm('h')=164; mm('H')=165; mm('i')=166; mm('I')=167; mm(237)=168; mm(205)=169; mm(236)=170; mm(204)=171; mm(238)=172; mm(206)=173; mm(239)=174; mm(207)=175; + mm('j')=176; mm('J')=177; mm('k')=178; mm('K')=179; mm('l')=180; mm('L')=181; mm('m')=182; mm('M')=183; mm('n')=184; mm('N')=185; mm(241)=186; mm(209)=187; mm('o')=188; mm('O')=189; mm(186)=190; mm(243)=191; + mm(211)=192; mm(242)=193; mm(210)=194; mm(244)=195; mm(212)=196; mm(246)=197; mm(214)=198; mm(245)=199; mm(213)=200; mm(248)=201; mm(216)=202; mm(156)=203; mm(140)=204; mm('p')=205; mm('P')=206; mm('q')=207; + mm('Q')=208; mm('r')=209; mm('R')=210; mm('s')=211; mm('S')=212; mm(154)=213; mm(138)=214; mm(223)=215; mm('t')=216; mm('T')=217; mm(254)=218; mm(222)=219; mm(153)=220; mm('u')=221; mm('U')=222; mm(250)=223; + mm(218)=224; mm(249)=225; mm(217)=226; mm(251)=227; mm(219)=228; mm(252)=229; mm(220)=230; mm('v')=231; mm('V')=232; mm('w')=233; mm('W')=234; mm('x')=235; mm('X')=236; mm('y')=237; mm('Y')=238; mm(253)=239; + mm(221)=240; mm(255)=241; mm(159)=242; mm('z')=243; mm('Z')=244; mm(158)=245; mm(142)=246; mm('\\')=247; mm(127)=248; mm(129)=249; mm(141)=250; mm(143)=251; mm(144)=252; mm(157)=253; mm(160)=254; mm(173)=255; #undef mm #define mm(_x) (map_nocase[(unsigned char)_x]) /* here case differences use the same code */ - mm( 0)= 0; mm( 1)= 1; mm( 2)= 2; mm( 3)= 3; mm( 4)= 4; mm( 5)= 5; mm( 6)= 6; mm( 7)= 7; mm( 8)= 8; mm( 9)= 9; mm( 10)= 10; mm( 11)= 11; mm( 12)= 12; mm( 13)= 13; mm( 14)= 14; mm( 15)= 15; - mm( 16)= 16; mm( 17)= 17; mm( 18)= 18; mm( 19)= 19; mm( 20)= 20; mm( 21)= 21; mm( 22)= 22; mm( 23)= 23; mm( 24)= 24; mm( 25)= 25; mm( 26)= 26; mm( 27)= 27; mm( 28)= 28; mm( 29)= 29; mm( 30)= 30; mm( 31)= 31; - mm('\'')= 32; mm('-')= 33; mm('–')= 34; mm('—')= 35; mm(' ')= 36; mm('!')= 37; mm('"')= 38; mm('#')= 39; mm('$')= 40; mm('%')= 41; mm('&')= 42; mm('(')= 43; mm(')')= 44; mm('*')= 45; mm(',')= 46; mm('.')= 47; - mm('/')= 48; mm(':')= 49; mm(';')= 50; mm('?')= 51; mm('@')= 52; mm('(')= 53; mm(')')= 54; mm('^')= 55; mm('ˆ')= 56; mm('_')= 57; mm('`')= 58; mm('{')= 59; mm('|')= 60; mm('}')= 61; mm('~')= 62; mm('¡')= 63; - mm('¦')= 64; mm('¨')= 65; mm('¯')= 66; mm('´')= 67; mm('¸')= 68; mm('¿')= 69; mm('˜')= 70; mm('‘')= 71; mm('’')= 72; mm('‚')= 73; mm('“')= 74; mm('”')= 75; mm('„')= 76; mm('‹')= 77; mm('›')= 78; mm('¢')= 79; - mm('£')= 80; mm('¤')= 81; mm('¥')= 82; mm('€')= 83; mm('+')= 84; mm('<')= 85; mm('=')= 86; mm('>')= 87; mm('±')= 88; mm('«')= 89; mm('»')= 90; mm('×')= 91; mm('÷')= 92; mm('§')= 93; mm('©')= 94; mm('¬')= 95; - mm('®')= 96; mm('°')= 97; mm('µ')= 98; mm('¶')= 99; mm('…')=100; mm('†')=101; mm('‡')=102; mm('•')=103; mm('•')=104; mm('‰')=105; mm('0')=106; mm('¼')=107; mm('½')=108; mm('¾')=109; mm('1')=110; mm('¹')=111; - mm('2')=112; mm('²')=113; mm('3')=114; mm('³')=115; mm('4')=116; mm('5')=117; mm('6')=118; mm('7')=119; mm('8')=120; mm('9')=121; mm('a')=122; mm('A')=122; mm('ª')=124; mm('á')=125; mm('Á')=125; mm('à')=127; - mm('À')=127; mm('â')=129; mm('Â')=129; mm('ä')=131; mm('Ä')=131; mm('ã')=133; mm('Ã')=133; mm('å')=135; mm('Å')=135; mm('æ')=137; mm('Æ')=137; mm('b')=139; mm('B')=139; mm('c')=141; mm('C')=141; mm('ç')=143; - mm('Ç')=143; mm('d')=145; mm('D')=145; mm('ð')=147; mm('Ð')=147; mm('e')=149; mm('E')=149; mm('é')=151; mm('É')=151; mm('è')=153; mm('È')=153; mm('ê')=155; mm('Ê')=155; mm('ë')=157; mm('Ë')=157; mm('f')=159; - mm('F')=159; mm('ƒ')=161; mm('g')=162; mm('G')=162; mm('h')=164; mm('H')=164; mm('i')=166; mm('I')=166; mm('í')=168; mm('Í')=168; mm('ì')=170; mm('Ì')=170; mm('î')=172; mm('Î')=172; mm('ï')=174; mm('Ï')=174; - mm('j')=176; mm('J')=176; mm('k')=178; mm('K')=178; mm('l')=180; mm('L')=180; mm('m')=182; mm('M')=182; mm('n')=184; mm('N')=184; mm('ñ')=186; mm('Ñ')=186; mm('o')=188; mm('O')=188; mm('º')=190; mm('ó')=191; - mm('Ó')=191; mm('ò')=193; mm('Ò')=193; mm('ô')=195; mm('Ô')=195; mm('ö')=197; mm('Ö')=197; mm('õ')=199; mm('Õ')=199; mm('ø')=201; mm('Ø')=201; mm('œ')=203; mm('Œ')=203; mm('p')=205; mm('P')=205; mm('q')=207; - mm('Q')=207; mm('r')=209; mm('R')=209; mm('s')=211; mm('S')=211; mm('š')=213; mm('Š')=213; mm('ß')=215; mm('t')=216; mm('T')=216; mm('þ')=218; mm('Þ')=218; mm('™')=220; mm('u')=221; mm('U')=221; mm('ú')=223; - mm('Ú')=223; mm('ù')=225; mm('Ù')=225; mm('û')=227; mm('Û')=227; mm('ü')=229; mm('Ü')=229; mm('v')=231; mm('V')=231; mm('w')=233; mm('W')=233; mm('x')=235; mm('X')=235; mm('y')=237; mm('Y')=237; mm('ý')=239; - mm('Ý')=239; mm('ÿ')=241; mm('Ÿ')=241; mm('z')=243; mm('Z')=243; mm('ž')=245; mm('Ž')=245; mm('\\')=247; mm(127)=248; mm(129)=249; mm(141)=250; mm(143)=251; mm(144)=252; mm(157)=253; mm(160)=254; mm(173)=255; + mm( 0)= 0; mm( 1)= 1; mm( 2)= 2; mm( 3)= 3; mm( 4)= 4; mm( 5)= 5; mm( 6)= 6; mm( 7)= 7; mm( 8)= 8; mm( 9)= 9; mm( 10)= 10; mm( 11)= 11; mm( 12)= 12; mm( 13)= 13; mm( 14)= 14; mm( 15)= 15; + mm( 16)= 16; mm( 17)= 17; mm( 18)= 18; mm( 19)= 19; mm( 20)= 20; mm( 21)= 21; mm( 22)= 22; mm( 23)= 23; mm( 24)= 24; mm( 25)= 25; mm( 26)= 26; mm( 27)= 27; mm( 28)= 28; mm( 29)= 29; mm( 30)= 30; mm( 31)= 31; + mm('\'')= 32; mm('-')= 33; mm(150)= 34; mm(151)= 35; mm(' ')= 36; mm('!')= 37; mm('"')= 38; mm('#')= 39; mm('$')= 40; mm('%')= 41; mm('&')= 42; mm('(')= 43; mm(')')= 44; mm('*')= 45; mm(',')= 46; mm('.')= 47; + mm('/')= 48; mm(':')= 49; mm(';')= 50; mm('?')= 51; mm('@')= 52; mm('(')= 53; mm(')')= 54; mm('^')= 55; mm(136)= 56; mm('_')= 57; mm('`')= 58; mm('{')= 59; mm('|')= 60; mm('}')= 61; mm('~')= 62; mm(161)= 63; + mm(166)= 64; mm(168)= 65; mm(175)= 66; mm(180)= 67; mm(184)= 68; mm(191)= 69; mm(152)= 70; mm(145)= 71; mm(146)= 72; mm(130)= 73; mm(147)= 74; mm(148)= 75; mm(132)= 76; mm(139)= 77; mm(155)= 78; mm(162)= 79; + mm(163)= 80; mm(164)= 81; mm(165)= 82; mm(128)= 83; mm('+')= 84; mm('<')= 85; mm('=')= 86; mm('>')= 87; mm(177)= 88; mm(171)= 89; mm(187)= 90; mm(215)= 91; mm(247)= 92; mm(167)= 93; mm(169)= 94; mm(172)= 95; + mm(174)= 96; mm(176)= 97; mm(181)= 98; mm(182)= 99; mm(133)=100; mm(134)=101; mm(135)=102; mm(149)=103; mm(149)=104; mm(137)=105; mm('0')=106; mm(188)=107; mm(189)=108; mm(190)=109; mm('1')=110; mm(185)=111; + mm('2')=112; mm(178)=113; mm('3')=114; mm(179)=115; mm('4')=116; mm('5')=117; mm('6')=118; mm('7')=119; mm('8')=120; mm('9')=121; mm('a')=122; mm('A')=122; mm(170)=124; mm(225)=125; mm(193)=125; mm(224)=127; + mm(192)=127; mm(226)=129; mm(194)=129; mm(228)=131; mm(196)=131; mm(227)=133; mm(195)=133; mm(229)=135; mm(197)=135; mm(230)=137; mm(198)=137; mm('b')=139; mm('B')=139; mm('c')=141; mm('C')=141; mm(231)=143; + mm(199)=143; mm('d')=145; mm('D')=145; mm(240)=147; mm(208)=147; mm('e')=149; mm('E')=149; mm(233)=151; mm(201)=151; mm(232)=153; mm(200)=153; mm(234)=155; mm(202)=155; mm(235)=157; mm(203)=157; mm('f')=159; + mm('F')=159; mm(131)=161; mm('g')=162; mm('G')=162; mm('h')=164; mm('H')=164; mm('i')=166; mm('I')=166; mm(237)=168; mm(205)=168; mm(236)=170; mm(204)=170; mm(238)=172; mm(206)=172; mm(239)=174; mm(207)=174; + mm('j')=176; mm('J')=176; mm('k')=178; mm('K')=178; mm('l')=180; mm('L')=180; mm('M')=182; mm('M')=182; mm('n')=184; mm('N')=184; mm(241)=186; mm(209)=186; mm('o')=188; mm('O')=188; mm(186)=190; mm(243)=191; + mm(211)=191; mm(242)=193; mm(210)=194; mm(244)=195; mm(212)=196; mm(246)=197; mm(214)=198; mm(245)=199; mm(213)=200; mm(248)=201; mm(216)=202; mm(156)=203; mm(140)=204; mm('p')=205; mm('P')=206; mm('q')=207; + mm('Q')=208; mm('r')=209; mm('R')=209; mm('s')=211; mm('S')=211; mm(154)=213; mm(138)=213; mm(223)=215; mm('t')=216; mm('T')=216; mm(254)=218; mm(222)=218; mm(153)=220; mm('u')=221; mm('U')=221; mm(250)=223; + mm(218)=223; mm(249)=225; mm(217)=225; mm(251)=227; mm(219)=227; mm(252)=229; mm(220)=229; mm('v')=231; mm('V')=231; mm('w')=233; mm('W')=233; mm('x')=235; mm('X')=235; mm('y')=237; mm('Y')=237; mm(253)=239; + mm(221)=239; mm(255)=241; mm(159)=241; mm('z')=243; mm('Z')=243; mm(158)=245; mm(142)=245; mm('\\')=247; mm(127)=248; mm(129)=249; mm(141)=250; mm(143)=251; mm(144)=252; mm(157)=253; mm(160)=254; mm(173)=255; #undef mm } diff --git a/iup/srccontrols/matrixex/iupmatex_units.c b/iup/srccontrols/matrixex/iupmatex_units.c index b19f8f3..cabe951 100644 --- a/iup/srccontrols/matrixex/iupmatex_units.c +++ b/iup/srccontrols/matrixex/iupmatex_units.c @@ -27,8 +27,6 @@ /* Source for conversion names, symbols and factors: http://en.wikipedia.org/wiki/Conversion_of_units - - IMPORTANT: the encoding of this file MUST be ISO8859-1. */ @@ -50,8 +48,8 @@ static ImatExUnit IMATEX_LENGTH_UNITS [IMATEX_UNIT_MAXCOUNT] = { {"millimetre" ,"mm", 0.001, NULL}, {"kilometre" ,"km", 1000, NULL}, {"nanometre" ,"nm", 1.0e-9, NULL}, - {"Angstrom" ,"Å" , 1.0e-10, "\xC3\x85" }, - {"micron" ,"µ" , 1.0e-6, "\xC2\xB5" }, /* International yard and pound agreement in 1959 */ + {"Angstrom" ,"\xC5" , 1.0e-10, "\xC3\x85" }, + {"micron" ,"\xB5" , 1.0e-6, "\xC2\xB5" }, /* International yard and pound agreement in 1959 */ {"inch" ,"in", 0.0254, NULL}, /* 0.0254 (in = 25.4 mm) */ {"foot" ,"ft", 0.3048, NULL}, /* 0.0254 * 12 (ft = 12 in) */ {"yard" ,"yd", 0.9144, NULL}, /* 0.0254 * 12 * 3 (yd = 3 ft) */ @@ -66,7 +64,7 @@ static ImatExUnit IMATEX_TIME_UNITS [IMATEX_UNIT_MAXCOUNT] = { {"day" ,"d" , 86400, NULL}, /* 60 * 60 * 24 */ {"week" ,"wk" , 604800, NULL}, /* 60 * 60 * 24 * 7 */ {"millisecond","ms", 0.001, NULL}, - {"microsecond","µs", 1.0e-6, "\xC2\xB5s"}}; + {"microsecond","\xB5s", 1.0e-6, "\xC2\xB5s"}}; #define IMATEX_MASS_COUNT 5 static ImatExUnit IMATEX_MASS_UNITS [IMATEX_UNIT_MAXCOUNT] = { @@ -81,36 +79,36 @@ static ImatExUnit IMATEX_MASS_UNITS [IMATEX_UNIT_MAXCOUNT] = { #define IMATEX_TEMPERATURE_COUNT 4 static ImatExUnit IMATEX_TEMPERATURE_UNITS [IMATEX_UNIT_MAXCOUNT] = { {"Kelvin" ,"K" , 1, NULL}, - {"degree Celsius" ,"°C" , 1, "\xC2\xBA""C"}, - {"degree Fahrenheit","°F" , 5./9., "\xC2\xBA""F"}, - {"degree Rankine" ,"°Ra", 5./9., "\xC2\xBA""Ra"}}; + {"degree Celsius" ,"\xB0C" , 1, "\xC2\xBA""C"}, + {"degree Fahrenheit","\xB0F" , 5./9., "\xC2\xBA""F"}, + {"degree Rankine" ,"\xB0Ra", 5./9., "\xC2\xBA""Ra"}}; #define IMATEX_AREA_COUNT 13 static ImatExUnit IMATEX_AREA_UNITS [IMATEX_UNIT_MAXCOUNT] = { - {"square metre" ,"m²" , 1, "m\xC2\xB2"}, /* '²' \178=ISO8859-1 \xC2\xB2=UTF-8 */ - {"square centimetre","cm²" , 1.0e-4, "cm\xC2\xB2"}, /* 0.01² */ - {"square millimetre","mm²" , 1.0e-6, "mm\xC2\xB2"}, /* 0.001² */ - {"square kilometre" ,"km²" , 1.0e6, "km\xC2\xB2"}, /* 1000² */ - {"square nanometre", "nm²", 1.0e-18, "nm\xC2\xB2" }, - {"square Angstrom", "Ų", 1.0e-20, "\xC3\x85\xC2\xB2" }, - {"square micron", "µ²", 1.0e-12, "\xC2\xB5\xC2\xB2" }, - {"square inch" ,"sq in", 6.4516e-4, NULL}, /* 0.0254² */ - {"square foot" ,"sq ft", 9.290304e-2, NULL}, /* 0.3048² */ - {"square yard" ,"sq yd", 0.83612736, NULL}, /* 0.9144² */ - {"square mile" ,"sq mi", 2.589988110336e6, NULL}, /* 1609.344² */ - {"acre" ,"ac" , 4046.8564224, NULL}, /* 0.9144² * 4840 (4840 sq yd) */ + {"square metre" ,"m\xB2" , 1, "m\xC2\xB2"}, /* '²' \178=ISO8859-1 \xC2\xB2=UTF-8 */ + {"square centimetre","cm\xB2" , 1.0e-4, "cm\xC2\xB2"}, /* 0.01² */ + {"square millimetre","mm\xB2" , 1.0e-6, "mm\xC2\xB2"}, /* 0.001² */ + {"square kilometre" ,"km\xB2" , 1.0e6, "km\xC2\xB2"}, /* 1000² */ + {"square nanometre", "nm\xB2", 1.0e-18, "nm\xC2\xB2" }, + {"square Angstrom", "\xC5\xB2", 1.0e-20, "\xC3\x85\xC2\xB2" }, + {"square micron", "\xB5\xB2", 1.0e-12, "\xC2\xB5\xC2\xB2" }, + {"square inch" ,"sq in", 6.4516e-4, NULL}, /* 0.0254² */ + {"square foot" ,"sq ft", 9.290304e-2, NULL}, /* 0.3048² */ + {"square yard" ,"sq yd", 0.83612736, NULL}, /* 0.9144² */ + {"square mile" ,"sq mi", 2.589988110336e6, NULL}, /* 1609.344² */ + {"acre" ,"ac" , 4046.8564224, NULL}, /* 0.9144² * 4840 (4840 sq yd) */ {"hectare" ,"ha" , 1.0e4, NULL}}; #define IMATEX_VOLUME_COUNT 11 static ImatExUnit IMATEX_VOLUME_UNITS [IMATEX_UNIT_MAXCOUNT] = { - {"cubic metre" ,"m³" , 1, "m\xC2\xB3"}, - {"cubic centimetre","cm³" , 1.0e-6, "cm\xC2\xB3"}, /* 0.01³ */ - {"cubic millimetre","mm³" , 1.0e-9, "mm\xC2\xB3"}, /* 0.001³ */ - {"cubic kilometre" ,"km³" , 1.0e9, "km\xC2\xB3"}, /* 1000³ */ - {"cubic inch" ,"cu in", 16.387064e-6, NULL}, /* 0.0254³ */ - {"cubic foot" ,"cu ft", 0.028316846592, NULL}, /* 0.3048³ */ - {"cubic yard" ,"cu yd", 0.764554857984, NULL}, /* 0.9144³ */ - {"cubic mile" ,"cu mi", 4168181825.440579584, NULL}, /* 1609.344³ */ + {"cubic metre" ,"m\xB3" , 1, "m\xC2\xB3"}, + {"cubic centimetre","cm\xB3" , 1.0e-6, "cm\xC2\xB3"}, /* 0.01³ */ + {"cubic millimetre","mm\xB3" , 1.0e-9, "mm\xC2\xB3"}, /* 0.001³ */ + {"cubic kilometre" ,"km\xB3" , 1.0e9, "km\xC2\xB3"}, /* 1000³ */ + {"cubic inch" ,"cu in", 16.387064e-6, NULL}, /* 0.0254³ */ + {"cubic foot" ,"cu ft", 0.028316846592, NULL}, /* 0.3048³ */ + {"cubic yard" ,"cu yd", 0.764554857984, NULL}, /* 0.9144³ */ + {"cubic mile" ,"cu mi", 4168181825.440579584, NULL}, /* 1609.344³ */ {"litre" ,"L" , 0.001 , NULL}, {"gallon" ,"gal" , 3.785411784e-3, NULL}, /* (US fluid; Wine = 231 cu in) */ {"barrel" ,"bl" , 0.158987294928, NULL}}; /* (petroleum = 42 gal) */ @@ -127,7 +125,7 @@ static ImatExUnit IMATEX_SPEED_UNITS [IMATEX_UNIT_MAXCOUNT] = { #define IMATEX_ANGULAR_SPEED_COUNT 6 static ImatExUnit IMATEX_ANGULAR_SPEED_UNITS [IMATEX_UNIT_MAXCOUNT] = { - {"radian per second" ,"rad/s" , 1, NULL}, + {"radian per second" ,"rad/s" , 1, NULL}, {"radian per minute" ,"rad/min", 60 , NULL}, {"degree per second" ,"deg/s" , M_PI/180.0, NULL}, {"degree per minute" ,"deg/min", M_PI/3.0 , NULL}, /* M_PI/180.0 * 60 */ @@ -136,74 +134,74 @@ static ImatExUnit IMATEX_ANGULAR_SPEED_UNITS [IMATEX_UNIT_MAXCOUNT] = { #define IMATEX_ACCELERATION_COUNT 5 static ImatExUnit IMATEX_ACCELERATION_UNITS [IMATEX_UNIT_MAXCOUNT] = { - {"metre per second squared","m/s²", 1, "m/s\xC2\xB2"}, - {"inch per second squared" ,"in/s²", 0.0254, "in/s\xC2\xB2"}, + {"metre per second squared","m/s\xB2", 1, "m/s\xC2\xB2"}, + {"inch per second squared" ,"in/s\xB2", 0.0254, "in/s\xC2\xB2"}, {"knot per second" ,"kn/s", 1.852/3.6 , NULL}, - {"mile per second squared" ,"mi/s²", 1609.344, "mi/s\xC2\xB2"}, + {"mile per second squared" ,"mi/s\xB2", 1609.344, "mi/s\xC2\xB2"}, {"standard gravity" ,"g" , GRAVITY , NULL}}; #define IMATEX_FORCE_COUNT 7 static ImatExUnit IMATEX_FORCE_UNITS [IMATEX_UNIT_MAXCOUNT] = { - {"Newton" ,"N" , 1, NULL}, /* N = kg·m/s² */ + {"Newton" ,"N" , 1, NULL}, /* N = kg·m/s² */ {"Kilonewton" ,"kN" , 1000 , NULL}, - {"dyne" ,"dyn", 1.0e-5 , NULL}, /* g·cm/s² */ + {"dyne" ,"dyn", 1.0e-5 , NULL}, /* g·cm/s² */ {"kilogram-force","kgf", GRAVITY , NULL}, - {"pound-force" ,"lbf", GRAVITY * 0.45359237, NULL}, /* lbf = g × lb */ - {"kip-force" ,"kip", GRAVITY * 0.45359237 * 1000, NULL}, /* kip = g × 1000 lb */ - {"ton-force" ,"tnf", GRAVITY * 0.45359237 * 2000, NULL}}; /* tnf = g × 2000 lb */ + {"pound-force" ,"lbf", GRAVITY * 0.45359237, NULL}, /* lbf = g × lb */ + {"kip-force" ,"kip", GRAVITY * 0.45359237 * 1000, NULL}, /* kip = g × 1000 lb */ + {"ton-force" ,"tnf", GRAVITY * 0.45359237 * 2000, NULL}}; /* tnf = g × 2000 lb */ #define IMATEX_PRESSURE_COUNT 8 static ImatExUnit IMATEX_PRESSURE_UNITS [IMATEX_UNIT_MAXCOUNT] = { - {"Pascal" ,"Pa" , 1, NULL}, /* Pa = N/m² = kg/(m·s²) */ + {"Pascal" ,"Pa" , 1, NULL}, /* Pa = N/m² = kg/(m·s²) */ {"kilopascal" ,"kPa" , 1000 , NULL}, {"atmosphere" ,"atm" , 101325 , NULL}, /* (standard) */ - {"millimetre of mercury","mmHg", 133.322387415, NULL}, /* 13595.1 kg/m³ × mm × g = 13595.1 * 0.001 * GRAVITY */ + {"millimetre of mercury","mmHg", 133.322387415, NULL}, /* 13595.1 kg/m³ × mm × g = 13595.1 * 0.001 * GRAVITY */ {"bar" ,"bar" , 1.0e5 , NULL}, {"torr" ,"torr", 101325.0/760.0, NULL}, /* aprox 133.3224 */ - {"pound per square inch","psi" , 4.4482216152605/6.4516e-4, NULL}, /* psi = lbf/in² = GRAVITY*0.45359237/0,0254² */ - {"kip per square inch" ,"ksi" , 4.4482216152605/6.4516e-1, NULL}}; /* ksi = kip/in² */ + {"pound per square inch","psi" , 4.4482216152605/6.4516e-4, NULL}, /* psi = lbf/in² = GRAVITY*0.45359237/0,0254² */ + {"kip per square inch" ,"ksi" , 4.4482216152605/6.4516e-1, NULL}}; /* ksi = kip/in² */ #define IMATEX_FORCE_PER_LENGTH_COUNT 4 /* same as (Linear Weight) */ static ImatExUnit IMATEX_FORCE_PER_LENGTH_UNITS [IMATEX_UNIT_MAXCOUNT] = { - {"Newton per metre" ,"N/m" , 1, NULL}, + {"Newton per metre" ,"N/m" , 1, NULL}, {"Kilonewton per metre" ,"kN/m" , 1000 , NULL}, {"kilogram-force per metre" ,"kgf/m", GRAVITY , NULL}, {"ton-force per metre" ,"tnf/m", GRAVITY*1000, NULL}}; #define IMATEX_MOMENT_COUNT 8 /* Torque */ static ImatExUnit IMATEX_MOMENT_UNITS [IMATEX_UNIT_MAXCOUNT] = { - {"Newton metre" , "N·m" , 1, "N\xC2\xB7m"}, /* '·' \183=ISO8859-1 \xC2B7=UTF-8 */ - {"kilogram-force metre" , "kgf·m" , GRAVITY, "kgf\xC2\xB7m"}, - {"ton-force metre" , "tnf·m" , GRAVITY*1000, "tnf\xC2\xB7m"}, - {"Newton centimetre" , "N·cm" , 100, "N\xC2\xB7m"}, - {"kilogram-force centimetre", "kgf·cm", GRAVITY*100, "kgf\xC2\xB7""cm"}, - {"ton-force centimetre" , "tnf·cm", GRAVITY*1000*100, "tnf\xC2\xB7""cm"}, - {"Kilonewton-metre" , "kN·m" , 1000, "kN\xC2\xB7m"}, - {"metre kilogram" , "m·kg" , 1.0/GRAVITY, "m\xC2\xB7kg"}}; + {"Newton metre" , "N\xB7m" , 1, "N\xC2\xB7m"}, /* '·' \183=ISO8859-1 \xC2B7=UTF-8 */ + {"kilogram-force metre" , "kgf\xB7m" , GRAVITY, "kgf\xC2\xB7m"}, + {"ton-force metre" , "tnf\xB7m" , GRAVITY*1000, "tnf\xC2\xB7m"}, + {"Newton centimetre" , "N\xB7cm" , 100, "N\xC2\xB7m"}, + {"kilogram-force centimetre", "kgf\xB7cm", GRAVITY*100, "kgf\xC2\xB7""cm"}, + {"ton-force centimetre" , "tnf\xB7cm", GRAVITY*1000*100, "tnf\xC2\xB7""cm"}, + {"Kilonewton-metre" , "kN\xB7m" , 1000, "kN\xC2\xB7m"}, + {"metre kilogram" , "m\xB7kg" , 1.0/GRAVITY, "m\xC2\xB7kg"}}; #define IMATEX_ANGLE_COUNT 3 static ImatExUnit IMATEX_ANGLE_UNITS [IMATEX_UNIT_MAXCOUNT] = { {"radian", "rad", 1, NULL}, - {"degree", "°", M_PI/180.0, "\xC2\xBA"}, + {"degree", "\xB0", M_PI/180.0, "\xC2\xBA"}, {"gradian", "grad", M_PI/200.0, NULL}}; #define IMATEX_SPECIFIC_MASS_COUNT 7 static ImatExUnit IMATEX_SPECIFIC_MASS_UNITS [IMATEX_UNIT_MAXCOUNT] = { - {"kilogram per cubic metre" ,"kg/m³" , 1, "kg/m\xC2\xB3"}, - {"gram per cubic centimetre","g/cm³" , 1000, "g/cm\xC2\xB3"}, + {"kilogram per cubic metre" ,"kg/m\xB3" , 1, "kg/m\xC2\xB3"}, + {"gram per cubic centimetre","g/cm\xB3" , 1000, "g/cm\xC2\xB3"}, {"gram per millilitre" ,"g/mL" , 1000, NULL}, - {"kilogram per litre" ,"kg/L" , 1000, NULL}, - {"pound per cubic foot" ,"lb/ft³" , 0.45359237/16.387064e-6, "lb/ft\xC2\xB3"}, - {"pound per cubic inch" ,"lb/in³" , 0.45359237/0.028316846592, "lb/in\xC2\xB3"}, + {"kilogram per litre" ,"kg/L" , 1000, NULL}, + {"pound per cubic foot" ,"lb/ft\xB3" , 0.45359237/16.387064e-6, "lb/ft\xC2\xB3"}, + {"pound per cubic inch" ,"lb/in\xB3" , 0.45359237/0.028316846592, "lb/in\xC2\xB3"}, {"pound per gallon" ,"lb/gal" , 0.45359237/3.785411784e-3, NULL}}; #define IMATEX_SPECIFIC_WEIGHT_COUNT 6 static ImatExUnit IMATEX_SPECIFIC_WEIGHT_UNITS [IMATEX_UNIT_MAXCOUNT] = { - {"Newton per cubic metre" ,"N/m³" , 1, "N/m\xC2\xB3"}, - {"Kilonewton per cubic metre" ,"kN/m³" , 1000, "kN/m\xC2\xB3"}, - {"kilogram-force per cubic metre","kgf/m³", GRAVITY, "kgf/m\xC2\xB3"}, - {"ton-force per cubic metre" ,"tnf/m³", GRAVITY * 1000, "tnf/m\xC2\xB3"}, - {"pound-force per cubic foot" ,"lbf/ft³", (GRAVITY * 0.45359237) / 0.028316846592, "lbf/m\xC2\xB3"}, + {"Newton per cubic metre" ,"N/m\xB3" , 1, "N/m\xC2\xB3"}, + {"Kilonewton per cubic metre" ,"kN/m\xB3" , 1000, "kN/m\xC2\xB3"}, + {"kilogram-force per cubic metre","kgf/m\xB3", GRAVITY, "kgf/m\xC2\xB3"}, + {"ton-force per cubic metre" ,"tnf/m\xB3", GRAVITY * 1000, "tnf/m\xC2\xB3"}, + {"pound-force per cubic foot" ,"lbf/ft\xB3", (GRAVITY * 0.45359237) / 0.028316846592, "lbf/m\xC2\xB3"}, {"kilogram-force per litre" ,"kgf/L" , GRAVITY * 0.001, NULL}}; #define IMATEX_ENERGY_COUNT 7 @@ -213,8 +211,8 @@ static ImatExUnit IMATEX_ENERGY_UNITS[IMATEX_UNIT_MAXCOUNT] = { {"calorie" ,"cal" , 4.1868 , NULL}, /* (International Table) */ {"kilocalorie" ,"kcal", 4.1868e3 , NULL}, {"BTU" ,"BTU" , 1.05505585262e3 , NULL}, /* (International Table) */ - {"Kilowatt-hour" ,"kW·h", 3.6e6 , "kW\xC2\xB7h"}, - {"horsepower-hour","hp·h", 2.684519537696172792e6, "hp\xC2\xB7h"}}; /* hp * 3600 */ + {"Kilowatt-hour" ,"kW\xB7h", 3.6e6 , "kW\xC2\xB7h"}, + {"horsepower-hour","hp\xB7h", 2.684519537696172792e6, "hp\xC2\xB7h"}}; /* hp * 3600 */ #define IMATEX_POWER_COUNT 4 static ImatExUnit IMATEX_POWER_UNITS[IMATEX_UNIT_MAXCOUNT] = { @@ -232,35 +230,35 @@ static ImatExUnit IMATEX_FRACTION_UNITS[IMATEX_UNIT_MAXCOUNT] = { #define IMATEX_KINEMATIC_VISCOSITY_COUNT 3 static ImatExUnit IMATEX_KINEMATIC_VISCOSITY_UNITS [IMATEX_UNIT_MAXCOUNT] = { - {"square metre per second", "m²/s" , 1, "m\xC2\xB2/s"}, - {"square foot per second" , "ft²/s" , 9.290304e-2, "ft\xC2\xB2/s"}, /* 0.3048² */ + {"square metre per second", "m\xB2/s" , 1, "m\xC2\xB2/s"}, + {"square foot per second" , "ft\xB2/s" , 9.290304e-2, "ft\xC2\xB2/s"}, /* 0.3048² */ {"stokes" , "St" , 1.0e-4, NULL}}; #define IMATEX_DYNAMIC_VISCOSITY_COUNT 4 static ImatExUnit IMATEX_DYNAMIC_VISCOSITY_UNITS [IMATEX_UNIT_MAXCOUNT] = { - {"Pascal second" , "Pa·s" , 1, "Pa\xC2\xB7s"}, - {"poise" , "P" , 0.1, NULL}, - {"pound per foot hour" , "lb/(ft·h)" , 0.45359237/(0.3048*3600), "lb/(ft\xC2\xB7h)"}, - {"pound per foot second", "lb/(ft·s)" , 0.45359237/0.3048, "lb/(ft\xC2\xB7s)"}}; + {"Pascal second" , "Pa\xB7s" , 1, "Pa\xC2\xB7s"}, + {"poise" , "P" , 0.1, NULL}, + {"pound per foot hour" , "lb/(ft\xB7h)" , 0.45359237/(0.3048*3600), "lb/(ft\xC2\xB7h)"}, + {"pound per foot second", "lb/(ft\xB7s)" , 0.45359237/0.3048, "lb/(ft\xC2\xB7s)"}}; #define IMATEX_FLOW_COUNT 3 static ImatExUnit IMATEX_FLOW_UNITS [IMATEX_UNIT_MAXCOUNT] = { - {"cubic metre per second", "m³/s", 0.1, "m\xC2\xB3/s"}, - {"cubic inch per second", "in³/s", 16.387064e-6, "in\xC2\xB3/s"}, /* 0.0254³ */ - {"cubic foot per second", "ft³/s", 0.028316846592, "ft\xC2\xB3/s"}}; /* 0.3048³ */ + {"cubic metre per second", "m\xB3/s", 0.1, "m\xC2\xB3/s"}, + {"cubic inch per second", "in\xB3/s", 16.387064e-6, "in\xC2\xB3/s"}, /* 0.0254³ */ + {"cubic foot per second", "ft\xB3/s", 0.028316846592, "ft\xC2\xB3/s"}}; /* 0.3048³ */ #define IMATEX_ILLUMINANCE_COUNT 4 static ImatExUnit IMATEX_ILLUMINANCE_UNITS [IMATEX_UNIT_MAXCOUNT] = { {"lux", "lx", 1, NULL}, {"footcandle", "fc", 10.763910417, NULL}, /* lumen per square foot */ - {"lumen per square inch", "lm/in²", 1550.00310001, "lm/in\xC2\xB2"}, + {"lumen per square inch", "lm/in\xB2", 1550.00310001, "lm/in\xC2\xB2"}, {"phot", "ph", 1.0e4, NULL}}; #define IMATEX_ELECTRIC_CHARGE_COUNT 3 static ImatExUnit IMATEX_ELECTRIC_CHARGE_UNITS [IMATEX_UNIT_MAXCOUNT] = { - {"Coulomb", "C", 1, NULL}, /* A·s */ + {"Coulomb", "C", 1, NULL}, /* A·s */ {"Faraday", "F", 96485.3383, NULL}, - {"milliampere hour", "mA·h", 3.6, "mA\xC2\xB7h"}}; + {"milliampere hour", "mA\xB7h", 3.6, "mA\xC2\xB7h"}}; typedef struct _ImatExQuantity {