Thread: [Padict-cvs] SF.net SVN: padict: [742] branches/unstable/padict
Brought to you by:
largegreenwood
Menu
▾
▴
padict-cvs
|
From: <ben...@us...> - 2006-05-11 23:16:21
|
Revision: 742 Author: benoitcerrina Date: 2006-05-11 16:16:05 -0700 (Thu, 11 May 2006) ViewCVS: http://svn.sourceforge.net/padict/?rev=742&view=rev Log Message: ----------- add JIS 0x4d4c, 0x7321 to taka and jstroke Modified Paths: -------------- branches/unstable/padict/.cdtproject branches/unstable/padict/CHANGELOG branches/unstable/padict/stroke/unistrok.13 branches/unstable/padict/stroke/unistrok.18 branches/unstable/padict/stroke/unistrok.6 branches/unstable/padict/taka/taka.pdbc Modified: branches/unstable/padict/.cdtproject =================================================================== --- branches/unstable/padict/.cdtproject 2006-05-08 16:20:10 UTC (rev 741) +++ branches/unstable/padict/.cdtproject 2006-05-11 23:16:05 UTC (rev 742) @@ -10,8 +10,8 @@ <pathentry kind="out" path=""/> </item> <item id="cdt_indexer"> -<indexEnabled indexValue="false"/> -<indexerProblemsEnabled indexProblemsValue="0"/> +<indexEnabled indexValue="true"/> +<indexerProblemsEnabled indexProblemsValue="7"/> </item> <item id="org.eclipse.cdt.make.core.buildtargets"> <buildTargets> Modified: branches/unstable/padict/CHANGELOG =================================================================== --- branches/unstable/padict/CHANGELOG 2006-05-08 16:20:10 UTC (rev 741) +++ branches/unstable/padict/CHANGELOG 2006-05-11 23:16:05 UTC (rev 742) @@ -1,4 +1,5 @@ 0.9.0 => 0.9.1 +rev 741: add kanji to taka and jstroke rev 736: bug corrections in the add to hotlist dialog for kanji rev 732: correct bug 1179944 now deactivate write anywhere when going into the kanji drawing screen rev 730: Save new version of kjdef pref earlier when it is found that the one on the machine is out of date @@ -15,13 +16,13 @@ modified JIS: 0x3E21, 0x4849, 0x402F, 0x317C, 0x3A57, 0x4424, 0x4268, 0x446F, 0x497E, 0x387A, 0x394D, 0x3B65 added: -JIS: 0x4f35, 0x5f6a, 0x3d6c +JIS: 0x4f35, 0x5f6a, 0x3d6c, 0x3262, 0x3264, 0x4d4c, 0x7321 JStroke corrections: add variants JIS: 0x316e, 0x3851, 0x472d add -JIS: 0x4f35, 0x5f6a, 0x3d6c +JIS: 0x4f35, 0x5f6a, 0x3d6c, 0x3262, 0x3264, 0x4d4c, 0x7321 0.3.3 => 0.9.0 support larger dictionary Modified: branches/unstable/padict/stroke/unistrok.13 =================================================================== --- branches/unstable/padict/stroke/unistrok.13 2006-05-08 16:20:10 UTC (rev 741) +++ branches/unstable/padict/stroke/unistrok.13 2006-05-11 23:16:05 UTC (rev 742) @@ -118,7 +118,9 @@ 732e 1785 | 6 2 2 b 3 1 6 6 2 6 x 3 3 9f13 1786 | 6 2 6 2 b 6 3 1 9 6 2 61 3 6226 1787 | 3 3 1 2 b 6 6 6 2 6 y 1 3 +#Benoit Cerrina add variant 6570 1790 | 3 1 6 2 1 3 13 x 6 1 6 x y +6570 1790 | 3 1 6 2 1 3 13 x 6 1 6 1 3 52e7 1857 | 1 6 6 x 2 2 6 2 6 6 6 b7 x 610f 2136 | 2 6 3 1 6 2 b 6 6 1 c 3 3 68c4 2137 | 2 6 16 3 6 2 2 2 6 6 2 1 3 @@ -223,3 +225,5 @@ #KOU glitter 714c 0 | 1 1 x 3 1 2 b 6 6 6 2 6 6 714c 0 | 3 1 x 3 1 2 b 6 6 6 2 6 6 +#YOU kawa yanagi willow +694a 0 | 6 2 1 3 2 b 6 6 6 1 b 1 1 Modified: branches/unstable/padict/stroke/unistrok.18 =================================================================== --- branches/unstable/padict/stroke/unistrok.18 2006-05-08 16:20:10 UTC (rev 741) +++ branches/unstable/padict/stroke/unistrok.18 2006-05-11 23:16:05 UTC (rev 742) @@ -65,3 +65,6 @@ 938c 0 | 1 3 6 6 2 3 1 9 3 1 6 b 6 6 2 2 1 3 #KEN maguta eyelids 77bc 0 | 2 b 6 6 6 1 3 6 2 b 6 2 b 6 1 3 1 3 +#GA goose +9d5d 0 | 1 6 24 9 y8 1 3 1 2 b 6 6 6 b 1 3 3 3 +9d5d 0 | 1 6 2 6 y 1 3 1 2 b 6 6 6 b 1 3 3 3 Modified: branches/unstable/padict/stroke/unistrok.6 =================================================================== --- branches/unstable/padict/stroke/unistrok.6 2006-05-08 16:20:10 UTC (rev 741) +++ branches/unstable/padict/stroke/unistrok.6 2006-05-11 23:16:05 UTC (rev 742) @@ -148,7 +148,6 @@ #Benoit Cerrina correction 6210 3537 | x 6 b1 y 1 3 6210 3537 | x 6 b1 y 14 3 -6210 3537 | x 6 b19 y 14 3 821f 3538 | 1 x b 3 2 6 ################################ # Modifications by Stephan Matthiesen Modified: branches/unstable/padict/taka/taka.pdbc =================================================================== --- branches/unstable/padict/taka/taka.pdbc 2006-05-08 16:20:10 UTC (rev 741) +++ branches/unstable/padict/taka/taka.pdbc 2006-05-11 23:16:05 UTC (rev 742) @@ -9,21 +9,21 @@ begin //first record is the index dec word - 2338//number of index entry + 2341//number of index entry 6 //size of one index entry //Character index: list of characters. [WORD: RecordID] [WORD: RecordOffset] [WORD: JisCode] //the RecordID and RecordOffset is where to find the glyph description for this character 5 6736 8505 4 4312 12321 - 20 6916 12325 - 20 4284 12326 + 20 6988 12325 + 20 4356 12326 21 4732 12329 21 6540 12333 2 5868 12334 - 19 6152 12341 + 19 6216 12341 5 9192 12343 18 6064 12344 - 23 5296 12351 + 23 4968 12351 18 1520 12354 18 8476 12357 6 5868 12358 @@ -33,27 +33,27 @@ 16 536 12366 2 8760 12367 6 1072 12368 - 24 3540 12369 + 24 3136 12369 11 2096 12370 21 7436 12371 16 2520 12373 8 632 12374 11 3908 12375 - 23 9136 12377 - 24 7280 12379 + 23 8808 12377 + 24 6876 12379 23 1200 12380 9 9912 12381 2 9576 12382 - 20 6376 12383 + 20 6448 12383 6 4648 12385 18 3420 12387 6 2060 12388 - 19 5824 12389 + 19 5888 12389 9 3760 12390 23 224 12391 - 20 8880 12392 + 20 8952 12392 7 3188 12393 - 23 4196 12396 + 23 3868 12396 5 780 12397 5 684 12399 22 6812 12400 @@ -74,13 +74,13 @@ 22 984 12585 14 9868 12587 4 9892 12589 - 20 1568 12593 + 20 1640 12593 16 4928 12594 7 3124 12602 10 9088 12603 16 7004 12604 10 0 12606 - 24 564 12607 + 24 160 12607 12 6600 12608 17 1272 12612 5 7984 12614 @@ -93,17 +93,17 @@ 4 3124 12627 16 7520 12628 9 4416 12629 - 24 3636 12630 + 24 3232 12630 14 760 12631 21 5072 12632 16 4832 12633 - 20 2880 12634 + 20 2952 12634 6 1836 12635 15 912 12636 2 428 12639 22 9232 12640 18 3484 12643 - 20 8292 12644 + 20 8364 12644 10 9596 12647 4 5944 12648 21 4636 12649 @@ -130,39 +130,39 @@ 16 8500 12843 6 1740 12844 18 860 12845 - 24 4292 12847 + 24 3888 12847 12 972 12848 - 19 4140 12849 + 19 4172 12849 14 792 12853 17 5320 12855 - 20 4372 12856 + 20 4444 12856 13 8552 12857 12 8028 12858 - 20 7956 12859 + 20 8028 12859 3 1808 12860 22 4236 12861 14 296 12862 - 13 9488 12863 + 13 9520 12863 4 2124 12864 11 1860 12865 - 20 9008 12866 + 20 9080 12866 11 7836 12867 - 13 9616 12868 + 13 9648 12868 4 2904 12870 5 2852 12871 9 9752 12872 3 5384 12873 21 4860 12874 - 20 1440 12875 - 23 4728 12876 + 20 1512 12875 + 23 4400 12876 8 1588 12877 6 8852 12878 13 3900 12879 16 7132 12880 - 20 6184 12882 + 20 6256 12882 18 2868 12883 - 24 532 12884 - 24 5292 12885 + 24 128 12884 + 24 4888 12885 9 8600 12886 17 2004 12888 6 8916 12889 @@ -171,8 +171,9 @@ 9 5472 12893 16 9784 12895 18 1584 12897 - 23 7204 12898 + 23 6876 12898 5 332 12899 + 13 8648 12900 11 7260 12902 3 8044 12903 16 9496 12904 @@ -190,21 +191,21 @@ 8 9036 12920 3 5020 12921 11 3592 12923 - 24 404 12924 + 24 0 12924 22 8220 12925 9 7384 12926 7 9712 13091 4 2376 13092 16 200 13093 12 3344 13094 - 20 224 13095 + 20 296 13095 3 7980 13096 11 9180 13099 2 8920 13100 11 2884 13101 7 5776 13103 9 3600 13104 - 20 3632 13105 + 20 3704 13105 5 7876 13106 21 7772 13108 10 8000 13109 @@ -226,7 +227,7 @@ 7 8560 13137 11 7020 13138 7 4052 13139 - 24 4504 13140 + 24 4100 13140 9 2732 13141 11 9400 13142 21 7500 13143 @@ -234,14 +235,14 @@ 6 6656 13145 17 1000 13146 6 6124 13147 - 20 3664 13149 + 20 3736 13149 17 7144 13155 14 96 13156 16 4768 13157 12 8640 13159 21 8892 13160 2 696 13161 - 19 6184 13162 + 19 6248 13162 15 6880 13164 22 4300 13165 21 5456 13166 @@ -262,7 +263,7 @@ 9 3536 13360 15 1092 13361 21 3632 13362 - 20 6504 13363 + 20 6576 13363 10 2028 13364 12 3772 13365 11 1924 13366 @@ -271,14 +272,14 @@ 14 8376 13369 5 1796 13370 3 8440 13373 - 23 9552 13374 + 23 9224 13374 13 8616 13375 3 3108 13376 6 6028 13377 17 1972 13380 - 24 1480 13381 + 24 1076 13381 3 2948 13382 - 20 9104 13383 + 20 9176 13383 17 4708 13385 13 6092 13386 10 1020 13387 @@ -294,25 +295,25 @@ 9 488 13400 11 8892 13401 13 2640 13403 - 19 3800 13405 + 19 3832 13405 8 344 13406 18 7900 13407 5 1956 13410 - 19 5260 13411 + 19 5324 13411 2 6260 13412 22 9856 13413 4 6440 13416 17 2852 13417 - 19 7876 13418 + 19 7940 13418 18 2032 13419 9 5504 13421 18 2664 13422 15 3976 13423 - 19 6948 13424 + 19 7012 13424 18 2632 13425 2 5964 13427 4 1984 13428 - 24 2668 13429 + 24 2264 13429 16 7036 13430 21 2492 13431 18 5336 13432 @@ -332,21 +333,21 @@ 7 2732 13612 15 6816 13613 14 4936 13614 - 20 6756 13615 + 20 6828 13615 7 924 13616 4 0 13617 11 1644 13618 6 2124 13619 2 9072 13620 18 6556 13621 - 24 6328 13622 + 24 5924 13622 13 6124 13623 13 7624 13625 15 2996 13626 12 8316 13627 2 8856 13628 - 23 2456 13629 - 20 3568 13630 + 23 2128 13629 + 20 3640 13630 11 9368 13631 13 2304 13633 13 5204 13636 @@ -356,20 +357,20 @@ 4 1952 13644 3 2412 13645 22 4724 13649 - 24 7216 13650 + 24 6812 13650 15 6572 13651 - 24 5656 13652 + 24 5252 13652 22 8284 13653 11 7672 13654 11 1676 13655 - 20 5960 13657 + 20 6032 13657 15 6944 13658 2 3536 13659 4 3484 13660 14 8064 13661 11 436 13662 21 2824 13663 - 24 7024 13664 + 24 6620 13664 10 7388 13665 22 4364 13667 6 3672 13668 @@ -383,19 +384,19 @@ 14 160 13677 14 1540 13678 10 1192 13679 - 19 9244 13680 + 19 9308 13680 22 2968 13681 9 8964 13682 15 1596 13683 21 6572 13685 - 23 2616 13686 + 23 2288 13686 6 1356 13687 18 3260 13689 12 1228 13691 6 3996 13693 13 6644 13694 11 2128 13857 - 13 9520 13859 + 13 9552 13859 10 2060 13861 10 8584 13862 14 5984 13863 @@ -404,18 +405,18 @@ 18 7420 13868 17 4136 13869 5 7592 13870 - 24 1660 13871 + 24 1256 13871 8 9876 13874 - 20 160 13875 + 20 232 13875 16 5528 13876 21 1388 13877 2 7100 13878 7 5004 13879 22 1832 13880 11 9620 13881 - 23 2744 13882 + 23 2416 13882 6 9952 13883 - 20 256 13884 + 20 328 13884 8 728 13885 23 784 13886 12 7380 13887 @@ -426,10 +427,10 @@ 9 900 13893 12 8380 13894 16 2456 13895 - 24 1756 13896 + 24 1352 13896 12 788 13897 17 6860 13898 - 20 0 13899 + 20 72 13899 16 1100 13900 9 4136 13904 6 2508 13905 @@ -444,8 +445,8 @@ 8 1716 13920 13 7752 13921 7 4084 13922 - 19 9992 13923 - 20 4500 13924 + 20 40 13923 + 20 4572 13924 18 4228 13925 9 6972 13927 6 1708 13928 @@ -463,8 +464,8 @@ 18 1020 13946 9 9720 13950 21 9520 14113 - 19 9856 14115 - 19 9212 14116 + 19 9920 14115 + 19 9276 14116 16 1652 14119 14 8408 14123 2 6824 14124 @@ -474,7 +475,7 @@ 12 2716 14129 8 600 14130 21 1228 14131 - 24 5228 14132 + 24 4824 14132 18 2772 14136 19 3388 14137 18 5084 14138 @@ -485,11 +486,11 @@ 7 5680 14144 9 1928 14145 15 6752 14146 - 20 3904 14147 + 20 3976 14147 7 7772 14148 14 5032 14150 5 8016 14151 - 24 5036 14152 + 24 4632 14152 14 7328 14153 22 1736 14154 22 7420 14155 @@ -510,7 +511,7 @@ 7 2668 14178 4 6472 14179 22 888 14182 - 19 8424 14183 + 19 8488 14183 8 7268 14184 3 32 14185 13 1544 14186 @@ -522,15 +523,15 @@ 22 3748 14194 4 248 14195 3 5428 14196 - 20 6216 14197 + 20 6288 14197 10 5924 14199 19 3420 14200 14 1680 14201 12 1664 14202 7 3616 14203 - 24 5688 14204 + 24 5284 14204 12 6824 14369 - 24 4184 14370 + 24 3780 14370 16 1812 14372 12 500 14373 8 376 14374 @@ -547,18 +548,18 @@ 5 9320 14387 15 588 14389 7 1536 14390 - 20 6248 14391 + 20 6320 14391 13 224 14392 - 20 4220 14393 - 23 3128 14394 + 20 4292 14393 + 23 2800 14394 2 396 14395 10 3768 14396 18 7868 14397 6 9688 14400 - 23 2488 14402 + 23 2160 14402 12 7112 14403 4 960 14404 - 20 9136 14405 + 20 9208 14405 9 2764 14406 16 6716 14407 9 1992 14409 @@ -573,7 +574,7 @@ 9 1508 14421 21 752 14423 13 7656 14424 - 24 6672 14427 + 24 6268 14427 5 2916 14428 4 8688 14429 4 1024 14430 @@ -582,7 +583,7 @@ 2 2208 14434 8 664 14435 21 720 14436 - 24 5260 14437 + 24 4856 14437 13 1480 14438 5 160 14439 6 5964 14443 @@ -596,14 +597,14 @@ 7 9408 14455 10 1416 14456 15 880 14457 - 19 4700 14458 + 19 4732 14458 16 9752 14460 16 1516 14461 21 5916 14462 9 5100 14625 - 20 6152 14627 + 20 6224 14627 22 1672 14629 - 20 4340 14630 + 20 4412 14630 18 3592 14631 7 9908 14633 3 8644 14634 @@ -617,9 +618,9 @@ 14 5128 14644 16 2264 14645 13 6548 14646 - 24 1852 14649 + 24 1448 14649 11 6988 14651 - 24 3668 14653 + 24 3264 14653 4 3612 14654 11 6828 14655 23 816 14657 @@ -628,45 +629,45 @@ 9 6080 14660 7 3924 14661 12 7016 14662 - 20 9724 14664 + 20 9796 14664 5 7180 14666 7 7276 14667 22 9168 14668 15 3060 14669 12 6176 14670 8 4860 14673 - 20 5528 14674 + 20 5600 14674 21 3708 14675 18 6096 14676 17 7112 14677 - 24 4896 14678 + 24 4492 14678 12 3932 14679 2 5900 14680 21 6476 14681 4 2612 14682 22 3480 14683 4 1424 14685 - 20 7860 14687 + 20 7932 14687 11 6408 14688 9 1864 14689 - 20 2516 14690 + 20 2588 14690 13 3964 14692 - 20 96 14694 + 20 168 14694 13 5984 14695 8 5468 14697 - 23 9584 14699 - 20 1472 14702 + 23 9256 14699 + 20 1544 14702 18 3452 14703 - 19 6636 14704 + 19 6700 14704 17 5600 14705 - 20 7648 14706 + 20 7720 14706 21 3784 14707 7 1756 14709 14 5716 14710 10 7356 14712 16 4800 14714 12 3408 14715 - 19 8816 14716 + 19 8880 14716 8 568 14718 15 3880 14881 6 7540 14882 @@ -674,37 +675,37 @@ 10 4352 14884 16 600 14886 15 1904 14887 - 23 9520 14888 + 23 9192 14888 18 4764 14889 10 5696 14890 - 23 2424 14891 - 19 6280 14892 + 23 2096 14891 + 19 6344 14892 10 8064 14894 5 8872 14896 4 2644 14897 14 4408 14898 9 5984 14899 - 23 8976 14900 + 23 8648 14900 13 700 14902 15 8960 14904 6 1580 14905 9 3908 14906 22 3512 14907 - 20 812 14909 + 20 884 14909 9 1604 14910 2 4812 14911 22 9664 14914 - 20 3504 14916 + 20 3576 14916 2 3760 14917 - 24 6100 14918 - 20 6056 14919 + 24 5696 14918 + 20 6128 14919 21 1100 14922 9 2464 14923 7 6116 14924 21 4924 14925 22 336 14926 12 5820 14927 - 20 9820 14928 + 20 9892 14928 16 9880 14929 11 2852 14930 22 7556 14931 @@ -720,7 +721,7 @@ 21 9552 14943 3 8504 14944 17 292 14945 - 24 2400 14946 + 24 1996 14946 2 8556 14948 13 2576 14949 11 5688 14953 @@ -728,7 +729,7 @@ 12 6632 14958 12 9312 14959 4 4848 14961 - 13 9584 14962 + 13 9616 14962 14 3232 14963 6 1612 14966 16 2156 14967 @@ -739,7 +740,7 @@ 16 4864 15137 15 4992 15139 22 4332 15140 - 20 4252 15141 + 20 4324 15141 16 8372 15142 14 5192 15144 11 3400 15150 @@ -747,15 +748,15 @@ 15 556 15153 2 3280 15154 22 5408 15155 - 20 6788 15156 + 20 6860 15156 18 7084 15158 - 24 64 15159 + 23 9872 15159 8 5740 15162 9 2068 15163 15 0 15165 16 5120 15167 5 6704 15168 - 19 5856 15170 + 19 5920 15170 18 3388 15171 3 1148 15172 12 7080 15173 @@ -766,9 +767,9 @@ 3 8772 15179 12 6856 15180 17 9708 15181 - 20 7556 15182 + 20 7628 15182 12 3740 15183 - 24 1820 15184 + 24 1416 15184 9 6048 15185 18 196 15186 4 6600 15188 @@ -786,7 +787,7 @@ 12 6984 15203 10 1224 15204 7 6180 15205 - 20 7320 15206 + 20 7392 15206 22 3544 15207 14 5524 15208 12 2576 15209 @@ -796,19 +797,19 @@ 7 5424 15213 10 2800 15214 5 1272 15215 - 19 7736 15216 + 19 7800 15216 5 3416 15217 - 23 9104 15218 + 23 8776 15218 17 3172 15219 17 4104 15220 5 9756 15221 14 6252 15222 - 13 8776 15223 + 13 8808 15223 15 3944 15224 4 7948 15225 12 7348 15226 18 8948 15227 - 19 9404 15228 + 19 9468 15228 3 8280 15229 16 9104 15230 12 3076 15393 @@ -816,7 +817,7 @@ 7 9744 15395 10 2092 15396 13 3516 15397 - 19 7672 15398 + 19 7736 15398 13 1512 15399 8 2612 15400 5 5228 15401 @@ -827,11 +828,11 @@ 9 6604 15408 5 3384 15409 11 1196 15412 - 24 3020 15415 + 24 2616 15415 17 3640 15417 3 7416 15418 3 5968 15420 - 20 9072 15422 + 20 9144 15422 9 3276 15423 12 596 15424 23 912 15425 @@ -845,7 +846,7 @@ 12 3836 15440 13 6060 15441 5 9564 15442 - 20 876 15444 + 20 948 15444 2 2568 15445 19 436 15446 10 8096 15447 @@ -876,9 +877,9 @@ 9 3308 15477 9 9040 15479 18 8540 15480 - 20 7416 15481 + 20 7488 15481 22 3716 15483 - 20 5560 15484 + 20 5632 15484 9 2336 15485 13 1812 15486 12 6568 15649 @@ -887,15 +888,15 @@ 18 2000 15652 11 6248 15653 14 9676 15654 - 20 7828 15656 + 20 7900 15656 10 1288 15657 19 2404 15658 - 19 5888 15660 + 19 5952 15660 10 5228 15661 15 4656 15662 8 5360 15664 - 23 9640 15665 - 20 1956 15667 + 23 9312 15665 + 20 2028 15667 2 3216 15669 16 4992 15670 17 8368 15671 @@ -912,9 +913,9 @@ 6 1964 15683 3 8676 15684 2 9672 15685 - 24 6992 15686 + 24 6588 15686 4 8140 15687 - 20 4876 15689 + 20 4948 15689 23 192 15690 4 3220 15691 17 4072 15692 @@ -924,8 +925,8 @@ 4 4052 15696 2 2112 15697 16 7100 15698 - 19 7444 15699 - 23 6356 15701 + 19 7508 15699 + 23 6028 15701 21 4796 15702 9 8996 15704 4 8012 15706 @@ -940,12 +941,12 @@ 5 4692 15717 10 6764 15719 8 4796 15720 - 23 7012 15721 + 23 6684 15721 13 5012 15722 - 23 2680 15723 + 23 2352 15723 18 9824 15724 14 9804 15726 - 24 1788 15727 + 24 1384 15727 13 6484 15728 9 2572 15729 17 5032 15732 @@ -964,32 +965,32 @@ 9 4168 15908 21 4764 15910 13 7784 15911 - 24 5196 15913 + 24 4792 15913 13 1124 15914 19 1740 15915 - 20 9756 15916 + 20 9828 15916 15 5024 15917 19 2500 15918 - 23 9040 15919 + 23 8712 15919 12 2544 15920 21 6748 15921 - 19 5760 15922 + 19 5824 15922 12 5124 15924 12 6208 15925 6 7928 15926 2 5608 15927 - 20 1332 15928 + 20 1404 15928 15 7708 15930 5 9224 15931 19 2664 15932 5 3448 15933 - 23 2648 15934 - 20 9628 15938 + 23 2320 15934 + 20 9700 15938 21 8408 15939 21 1356 15940 17 5096 15942 16 2124 15943 - 13 8680 15944 + 13 8712 15944 4 6008 15945 18 7388 15946 11 404 15947 @@ -998,22 +999,22 @@ 15 8420 15950 21 288 15951 14 4568 15952 - 24 6800 15953 + 24 6396 15953 9 1960 15954 - 20 4436 15955 + 20 4508 15955 21 2044 15959 - 23 5200 15961 + 23 4872 15961 21 320 15962 15 5764 15963 18 8604 15964 - 20 2912 15965 + 20 2984 15965 7 3476 15966 2 6552 15967 9 5440 15970 - 19 5292 15971 + 19 5356 15971 8 8772 15973 - 24 5752 15974 - 24 96 15976 + 24 5348 15974 + 23 9904 15976 15 5464 15977 12 6696 15978 22 4960 15979 @@ -1022,7 +1023,7 @@ 2 1424 15982 16 8308 15983 5 5760 15984 - 19 7940 15986 + 19 8004 15986 2 8824 15988 8 792 15989 2 3992 15990 @@ -1041,22 +1042,22 @@ 17 4328 16169 14 2700 16171 17 1032 16173 - 19 6916 16174 + 19 6980 16174 7 2700 16175 6 3920 16176 - 24 5920 16177 - 20 6408 16178 + 24 5516 16177 + 20 6480 16178 5 460 16179 - 19 4764 16180 + 19 4828 16180 2 8728 16181 12 6664 16182 2 4380 16183 10 8648 16185 - 24 7248 16187 + 24 6844 16187 19 2100 16188 21 9488 16189 5 5792 16190 - 20 2000 16191 + 20 2072 16191 16 2584 16192 22 1800 16194 11 4896 16195 @@ -1067,9 +1068,9 @@ 4 2408 16201 9 2164 16202 5 1304 16203 - 20 7352 16204 + 20 7424 16204 18 9044 16205 - 20 6120 16206 + 20 6192 16206 16 1352 16207 7 1292 16210 14 7736 16211 @@ -1079,7 +1080,7 @@ 16 9816 16221 9 7416 16222 21 5104 16225 - 24 952 16226 + 24 548 16226 3 5352 16227 6 8436 16228 5 7656 16229 @@ -1087,7 +1088,7 @@ 10 9368 16231 8 9164 16232 17 2428 16233 - 19 7972 16234 + 19 8036 16234 12 5608 16235 8 4828 16236 21 2888 16238 @@ -1097,20 +1098,20 @@ 10 524 16243 8 1364 16244 13 1448 16245 - 24 1448 16248 - 20 6344 16249 + 24 1044 16248 + 20 6416 16249 17 7956 16417 - 19 9920 16418 + 19 9984 16418 6 9088 16419 11 9020 16420 17 324 16421 16 9264 16422 4 9148 16423 - 19 6980 16425 + 19 7044 16425 14 0 16426 16 1320 16427 - 23 5168 16428 - 20 8356 16429 + 23 4840 16428 + 20 8428 16429 6 4912 16430 8 1396 16431 7 3672 16432 @@ -1120,13 +1121,13 @@ 17 1096 16438 10 9756 16439 16 3824 16440 - 23 7544 16441 + 23 7216 16441 6 4040 16442 10 3992 16443 - 13 9680 16444 + 13 9712 16444 13 5920 16445 6 180 16446 - 24 5068 16447 + 24 4664 16447 3 8344 16448 11 6376 16449 22 6844 16450 @@ -1135,7 +1136,7 @@ 7 5068 16454 4 4784 16455 5 1496 16457 - 20 9168 16458 + 20 9240 16458 14 5064 16459 6 9332 16461 15 3028 16462 @@ -1146,18 +1147,18 @@ 6 9012 16467 5 6188 16469 21 1484 16470 - 20 780 16471 + 20 852 16471 6 3480 16474 - 24 32 16475 - 20 5896 16476 - 19 4044 16477 - 20 4596 16478 + 23 9840 16475 + 20 5968 16476 + 19 4076 16477 + 20 4668 16478 5 6156 16479 8 9196 16480 17 4232 16481 8 7076 16482 8 9908 16483 - 24 2112 16484 + 24 1708 16484 4 4880 16485 17 9336 16487 22 6124 16488 @@ -1170,7 +1171,7 @@ 17 6292 16496 18 4068 16498 8 7204 16500 - 13 9872 16501 + 13 9904 16501 18 7964 16502 22 432 16503 8 1836 16504 @@ -1183,24 +1184,24 @@ 9 6668 16676 8 4732 16677 11 372 16678 - 19 6216 16681 + 19 6280 16681 17 8400 16682 16 6972 16683 10 7936 16684 - 24 500 16685 - 23 9008 16687 + 24 96 16685 + 23 8680 16687 8 1492 16688 - 24 6832 16689 + 24 6428 16689 6 7088 16690 - 24 3572 16691 + 24 3168 16691 17 9548 16692 - 20 3600 16693 + 20 3672 16693 5 8776 16694 - 20 8324 16698 + 20 8396 16698 9 1348 16700 11 3324 16702 7 520 16703 - 20 6088 16706 + 20 6160 16706 2 4844 16707 7 3520 16708 11 5784 16709 @@ -1208,10 +1209,10 @@ 17 6828 16711 3 9008 16712 16 2424 16714 - 20 8848 16715 + 20 8920 16715 21 6444 16718 4 4248 16719 - 20 6948 16720 + 20 7020 16720 17 4040 16722 17 2608 16723 12 1068 16724 @@ -1219,20 +1220,20 @@ 12 2608 16728 4 7028 16731 9 2240 16732 - 24 5624 16733 + 24 5220 16733 7 8452 16734 11 3560 16736 - 24 4472 16737 + 24 4068 16737 8 1092 16738 11 6344 16739 18 9920 16741 - 23 9072 16743 + 23 8744 16743 16 232 16744 9 9816 16746 12 9280 16747 - 24 2188 16749 + 24 1784 16749 2 1488 16752 - 19 5792 16753 + 19 5856 16753 6 6156 16754 6 5676 16756 4 6760 16757 @@ -1246,7 +1247,7 @@ 13 5236 16766 7 6588 16929 22 8348 16930 - 24 4388 16931 + 24 3984 16931 11 4308 16932 18 8572 16933 8 1620 16934 @@ -1255,35 +1256,35 @@ 12 3964 16937 17 7628 16938 3 3684 16939 - 19 4560 16940 + 19 4592 16940 13 2984 16941 16 6184 16942 8 1556 16943 - 13 8712 16944 + 13 8744 16944 18 828 16945 - 24 7056 16946 + 24 6652 16946 7 860 16947 5 3244 16948 11 7608 16950 - 19 7348 16952 + 19 7412 16952 16 2488 16953 14 5920 16954 - 24 6864 16955 + 24 6460 16955 11 3940 16956 2 8664 16958 21 2396 16959 16 8244 16960 14 5856 16961 - 20 1376 16964 + 20 1448 16964 12 5092 16965 9 2272 16966 7 5744 16967 - 20 1172 16972 + 20 1244 16972 21 4268 16974 7 5036 16976 15 9508 16977 - 24 1724 16979 - 23 5492 16980 + 24 1320 16979 + 23 5164 16980 12 3268 16981 13 1384 16982 5 3352 16984 @@ -1295,7 +1296,7 @@ 22 9728 16992 22 6716 16993 17 7564 16994 - 19 7844 16997 + 19 7908 16997 5 1464 16998 14 4664 16999 17 4008 17000 @@ -1306,9 +1307,9 @@ 15 6136 17008 14 2764 17010 14 5556 17011 - 19 6312 17012 + 19 6376 17012 22 2512 17013 - 20 9692 17015 + 20 9764 17015 6 7444 17017 12 8780 17018 16 632 17186 @@ -1319,10 +1320,10 @@ 15 976 17191 17 356 17194 7 8920 17195 - 24 920 17199 + 24 516 17199 18 7200 17200 - 19 6344 17201 - 20 3740 17202 + 19 6408 17201 + 20 3812 17202 7 8888 17204 14 9740 17205 5 2660 17206 @@ -1338,16 +1339,16 @@ 12 8348 17222 15 6072 17223 23 96 17224 - 24 7152 17226 + 24 6748 17226 4 2016 17227 11 3812 17228 3 1916 17229 9 3728 17230 4 3012 17231 - 20 4812 17233 + 20 4884 17233 15 1380 17235 5 3320 17236 - 20 5636 17237 + 20 5708 17237 22 4268 17238 3 7852 17239 10 8552 17241 @@ -1362,8 +1363,8 @@ 16 6088 17251 16 9200 17252 5 9128 17253 - 20 3772 17254 - 19 6408 17255 + 20 3844 17254 + 19 6472 17255 19 372 17256 15 3092 17257 5 5600 17258 @@ -1372,10 +1373,10 @@ 16 5960 17261 7 0 17262 17 4740 17263 - 20 4908 17266 + 20 4980 17266 17 4200 17267 15 1348 17272 - 23 3096 17273 + 23 2768 17273 2 6616 17274 18 3720 17275 12 756 17278 @@ -1383,7 +1384,7 @@ 8 6616 17443 8 3592 17444 9 2368 17445 - 24 7312 17446 + 24 6908 17446 15 9572 17447 8 1124 17448 18 4164 17449 @@ -1400,13 +1401,13 @@ 6 7152 17465 19 2696 17466 4 5404 17467 - 23 4268 17468 + 23 3940 17468 21 4236 17470 18 6000 17471 22 9200 17472 3 3172 17473 - 20 3936 17474 - 20 1408 17475 + 20 4008 17474 + 20 1480 17475 9 9148 17476 9 64 17477 11 1476 17478 @@ -1418,7 +1419,7 @@ 22 4204 17492 9 7480 17498 14 6776 17502 - 23 4696 17503 + 23 4368 17503 16 8436 17504 2 8952 17506 12 3108 17507 @@ -1441,7 +1442,7 @@ 23 32 17531 21 2524 17534 22 9792 17697 - 20 6852 17701 + 20 6924 17701 5 1240 17702 9 4720 17704 6 1804 17705 @@ -1450,12 +1451,12 @@ 12 9824 17708 8 5708 17711 14 7232 17712 - 24 6896 17713 - 20 1204 17715 + 24 6492 17713 + 20 1276 17715 17 9676 17716 16 5560 17717 5 6952 17719 - 20 4844 17720 + 20 4916 17720 11 9464 17721 11 928 17722 8 280 17726 @@ -1471,14 +1472,14 @@ 18 3356 17740 21 384 17741 3 8012 17743 - 19 4076 17744 + 19 4108 17744 6 8468 17746 6 1452 17747 - 23 5232 17748 + 23 4904 17748 14 3548 17752 11 8316 17753 13 7160 17754 - 19 7704 17755 + 19 7768 17755 13 8060 17756 8 9228 17757 21 6508 17758 @@ -1494,25 +1495,25 @@ 15 2380 17772 4 7484 17773 4 864 17775 - 20 8420 17776 + 20 8492 17776 22 2480 17778 13 256 17779 - 20 6820 17780 + 20 6892 17780 16 1780 17782 7 3156 17783 4 7516 17785 6 8372 17786 3 7884 17787 - 23 6464 17788 + 23 6136 17788 15 1840 17789 - 23 2840 17790 - 20 436 17956 + 23 2512 17790 + 20 508 17956 9 2304 17957 2 1552 17958 5 888 17959 14 3136 17960 - 20 5992 17961 - 24 6704 17963 + 20 6064 17961 + 24 6300 17963 6 9984 17964 15 6848 17965 21 7404 17966 @@ -1522,23 +1523,23 @@ 7 6460 17970 11 2192 17971 6 8980 17974 - 20 3536 17976 + 20 3608 17976 14 5396 17977 18 4476 17979 13 5140 17980 14 2328 17981 - 19 9952 17983 + 20 0 17983 11 5720 17984 18 7932 17985 21 1132 17987 15 1220 17988 - 23 6528 17990 + 23 6200 17990 16 7948 17991 5 8904 17992 18 4100 17993 21 3152 17996 6 3640 17997 - 24 3700 17999 + 24 3296 17999 2 4952 18002 12 5852 18003 6 3952 18004 @@ -1556,7 +1557,7 @@ 3 6000 18033 14 5620 18035 13 1416 18036 - 20 3708 18037 + 20 3780 18037 12 3472 18039 13 8124 18041 12 4248 18043 @@ -1567,23 +1568,23 @@ 13 8416 18210 12 4736 18212 4 6632 18213 - 20 1236 18214 - 19 6504 18215 - 23 8056 18219 + 20 1308 18214 + 19 6568 18215 + 23 7728 18219 9 4752 18221 14 32 18222 - 24 5400 18223 + 24 4996 18223 16 5928 18224 21 2140 18227 13 7592 18228 18 2836 18229 5 5992 18231 18 5432 18234 - 24 596 18235 + 24 192 18235 13 3772 18236 17 32 18237 - 23 6432 18238 - 19 4464 18240 + 23 6104 18238 + 19 4496 18240 17 2640 18243 8 1460 18244 10 8292 18246 @@ -1605,10 +1606,10 @@ 22 1640 18268 9 5536 18269 16 6908 18270 - 20 7892 18271 + 20 7964 18271 2 7432 18275 2 3020 18276 - 19 4624 18277 + 19 4656 18277 22 2448 18278 6 7476 18284 13 6516 18286 @@ -1623,7 +1624,7 @@ 21 1196 18299 4 2080 18300 4 6376 18302 - 19 8360 18466 + 19 8424 18466 8 3420 18473 15 4624 18474 12 2748 18476 @@ -1642,7 +1643,7 @@ 18 732 18498 14 4968 18500 5 268 18503 - 19 6472 18504 + 19 6536 18504 12 8704 18505 16 2616 18506 15 5828 18507 @@ -1651,7 +1652,7 @@ 6 1644 18510 8 6020 18511 22 5744 18512 - 20 6472 18513 + 20 6544 18513 14 7360 18514 2 3152 18515 10 5476 18517 @@ -1660,27 +1661,27 @@ 4 7060 18522 22 9952 18524 10 3896 18525 - 20 6440 18526 + 20 6512 18526 2 6324 18528 10 9692 18529 6 2156 18530 7 552 18531 5 7952 18532 22 9328 18534 - 19 8036 18535 + 19 8100 18535 2 8792 18536 18 8188 18537 11 3164 18538 9 4320 18539 7 204 18541 - 23 8024 18542 - 23 6496 18543 + 23 7696 18542 + 23 6168 18543 16 2936 18545 8 4252 18546 11 4372 18547 12 0 18548 16 1748 18551 - 19 7012 18552 + 19 7076 18552 18 120 18553 5 192 18558 8 1932 18721 @@ -1688,7 +1689,7 @@ 12 9888 18725 4 6996 18727 6 9364 18732 - 24 5592 18734 + 24 5188 18734 17 1732 18737 3 3140 18738 12 2512 18740 @@ -1699,15 +1700,15 @@ 21 7340 18746 15 4388 18748 8 7976 18749 - 13 8648 18750 + 13 8680 18750 18 7052 18753 5 9160 18754 14 7704 18755 19 2340 18756 - 24 4248 18762 + 24 3844 18762 22 6028 18765 - 20 6280 18767 - 20 8484 18768 + 20 6352 18767 + 20 8556 18768 22 6972 18769 8 1332 18770 16 2024 18771 @@ -1719,18 +1720,18 @@ 19 1804 18779 13 860 18780 17 9272 18781 - 19 7380 18782 + 19 7444 18782 8 2548 18783 14 328 18784 19 1772 18785 2 8588 18786 - 24 6360 18787 + 24 5956 18787 21 3120 18788 19 3216 18789 17 8640 18790 15 8928 18792 23 1464 18793 - 20 7924 18794 + 20 7996 18794 2 2240 18795 21 1420 18796 21 7804 18797 @@ -1754,19 +1755,19 @@ 13 7688 18984 4 216 18985 13 8584 18986 - 24 5100 18988 + 24 4696 18988 5 1924 18990 15 4960 18991 13 2272 18992 3 9328 18995 - 20 7288 18996 + 20 7360 18996 21 5948 18997 13 668 18998 5 6640 18999 6 5492 19000 4 3516 19001 - 20 4188 19002 - 19 6248 19003 + 20 4260 19002 + 19 6312 19003 17 5288 19004 13 5076 19005 22 4588 19006 @@ -1778,7 +1779,7 @@ 21 688 19013 10 2896 19014 5 920 19015 - 20 7460 19017 + 20 7532 19017 7 2764 19018 11 480 19020 16 5896 19024 @@ -1788,21 +1789,21 @@ 22 6908 19029 14 5824 19030 16 2392 19031 - 20 6980 19032 + 20 7052 19032 21 7468 19033 7 7740 19035 2 8620 19036 12 3440 19037 - 20 7524 19038 + 20 7596 19038 4 2980 19041 3 872 19042 16 5624 19043 14 7264 19044 11 3292 19046 - 23 5036 19047 + 23 4708 19047 8 1156 19048 7 3868 19049 - 23 8112 19050 + 23 7784 19050 16 1264 19051 23 1528 19052 7 2964 19053 @@ -1821,27 +1822,27 @@ 22 952 19070 10 8356 19233 3 9296 19234 - 20 5668 19236 - 20 6884 19237 + 20 5740 19236 + 20 6956 19237 5 8744 19238 8 3516 19239 5 748 19243 13 1352 19244 18 5496 19245 - 23 2712 19246 + 23 2384 19246 10 4896 19248 - 23 2872 19251 + 23 2544 19251 17 4804 19252 21 4828 19253 5 2724 19254 16 6056 19255 - 13 9712 19256 + 13 9744 19256 14 5096 19257 - 24 2788 19258 + 24 2384 19258 14 5492 19259 6 1484 19260 - 20 5928 19261 - 20 5700 19262 + 20 6000 19261 + 20 5772 19262 13 7720 19263 8 996 19264 13 5952 19265 @@ -1856,10 +1857,10 @@ 3 6064 19277 9 6396 19278 4 5976 19279 - 24 7120 19280 + 24 6716 19280 16 1684 19281 10 1256 19282 - 24 5324 19287 + 24 4920 19287 21 2760 19289 5 4404 19291 13 6676 19292 @@ -1867,13 +1868,13 @@ 12 8412 19294 4 4752 19295 16 4896 19296 - 19 4108 19297 + 19 4140 19297 3 8580 19298 5 2628 19299 - 24 1692 19300 + 24 1288 19300 11 1444 19301 - 23 2552 19303 - 23 5004 19304 + 23 2224 19303 + 23 4676 19304 5 2236 19307 16 5024 19308 21 352 19309 @@ -1884,18 +1885,18 @@ 15 8896 19322 12 4916 19324 11 7932 19325 - 24 6576 19326 + 24 6172 19326 9 2400 19489 - 19 7412 19491 + 19 7476 19491 5 9788 19492 3 9232 19493 - 24 468 19496 + 24 64 19496 9 3352 19497 9 2196 19498 6 1420 19502 16 7872 19503 13 2336 19505 - 20 404 19506 + 20 476 19506 12 468 19507 15 7984 19508 12 4216 19509 @@ -1904,11 +1905,11 @@ 21 2108 19515 5 396 19516 21 4404 19518 - 20 32 19519 - 24 7184 19520 + 20 104 19519 + 24 6780 19520 18 2804 19521 15 7920 19522 - 23 3064 19523 + 23 2736 19523 13 6856 19524 5 6920 19527 13 4212 19528 @@ -1918,9 +1919,9 @@ 2 9640 19535 16 9040 19536 2 3344 19537 - 19 4732 19538 + 19 4764 19538 8 5804 19539 - 19 4172 19540 + 19 4204 19540 13 5792 19541 3 5872 19542 22 304 19543 @@ -1931,26 +1932,26 @@ 4 9924 19552 21 2172 19553 2 4780 19556 - 19 8068 19558 + 19 8132 19558 9 4784 19559 13 6156 19560 21 848 19561 8 4700 19563 10 2864 19566 - 23 9704 19568 + 23 9376 19568 4 7612 19569 13 3548 19570 6 2908 19571 12 9464 19572 - 20 7256 19573 + 20 7328 19573 16 1620 19574 7 3092 19576 5 856 19579 11 2064 19580 4 3324 19581 2 3568 19582 - 20 8912 19745 - 20 3968 19746 + 20 8984 19745 + 20 4040 19746 11 8488 19747 8 3836 19749 14 2360 19750 @@ -1963,7 +1964,7 @@ 21 5136 19763 5 2520 19765 9 9116 19766 - 24 6928 19767 + 24 6524 19767 19 404 19768 4 6664 19769 6 8948 19770 @@ -1973,18 +1974,19 @@ 17 5664 19774 14 1776 19775 4 6568 19776 - 13 9840 19778 + 13 9872 19778 9 1476 19780 23 1264 19782 - 20 4468 19783 - 19 4496 19784 + 20 4540 19783 + 19 4528 19784 11 8988 19785 11 9588 19786 8 3356 19787 - 19 6376 19789 + 19 4796 19788 + 19 6440 19789 15 8104 19790 11 7228 19791 - 23 5264 19792 + 23 4936 19792 17 64 19793 12 7796 19794 6 7572 19795 @@ -1993,7 +1995,7 @@ 22 6940 19800 8 1524 19801 12 3868 19803 - 19 9888 19804 + 19 9952 19804 22 9296 19806 21 2076 19807 10 1448 19809 @@ -2026,16 +2028,16 @@ 2 7844 20008 8 4284 20009 14 5588 20012 - 19 8392 20014 + 19 8456 20014 3 1180 20017 5 128 20018 - 23 2776 20019 + 23 2448 20019 22 4396 20020 10 3832 20021 11 896 20022 14 2040 20024 17 420 20025 - 24 2988 20026 + 24 2584 20026 17 2460 20027 22 8252 20029 3 6096 20030 @@ -2044,22 +2046,22 @@ 19 900 20035 10 3800 20036 11 512 20037 - 13 8744 20040 + 13 8776 20040 3 1212 20041 - 23 2584 20044 + 23 2256 20044 4 8172 20045 15 2032 20046 12 5640 20047 13 796 20048 3 2284 20049 - 20 4404 20050 - 23 5680 20051 + 20 4476 20050 + 23 5352 20051 12 9528 20055 7 3988 20056 9 836 20057 3 8536 20061 17 9644 20062 - 24 7088 20063 + 24 6684 20063 13 4948 20064 12 1100 20065 18 1616 20067 @@ -2067,21 +2069,21 @@ 9 520 20069 17 9968 20073 6 1676 20075 - 20 3472 20076 + 20 3544 20076 19 3292 20077 - 24 4960 20078 + 24 4556 20078 21 1292 20079 21 9456 20080 - 20 192 20081 + 20 264 20081 17 2948 20082 3 2380 20083 - 24 1628 20084 + 24 1224 20084 5 7528 20085 21 4204 20086 10 7904 20087 18 3228 20088 10 2832 20093 - 24 5888 20258 + 24 5484 20258 10 5444 20259 3 904 20260 14 4440 20263 @@ -2090,13 +2092,13 @@ 23 536 20267 8 1028 20269 9 8300 20271 - 24 6544 20272 - 24 4216 20274 + 24 6140 20272 + 24 3812 20274 11 4004 20275 15 7552 20277 17 4772 20279 - 20 9788 20282 - 20 6024 20283 + 20 9860 20282 + 20 6096 20283 10 4800 20286 21 4700 20287 3 8708 20288 @@ -2115,7 +2117,7 @@ 16 1384 20530 14 7296 20532 17 2980 20533 - 24 4420 20534 + 24 4016 20534 4 3580 20537 6 3704 20538 7 268 20542 @@ -2123,31 +2125,31 @@ 4 6504 20565 8 3452 20605 7 8484 20769 - 20 6312 20781 + 20 6384 20781 9 932 20793 2 632 20794 3 8408 20796 - 20 2032 20804 + 20 2104 20804 17 5224 20808 15 6168 20810 2 4876 20812 9 4512 20815 15 1040 20818 - 24 2700 20827 + 24 2296 20827 15 9292 20828 8 5392 20833 23 0 20856 - 13 9552 20857 + 13 9584 20857 5 1336 21037 2 728 21041 - 13 9744 21042 + 13 9776 21042 21 256 21043 14 964 21048 - 23 5092 21049 + 23 4764 21049 16 7068 21053 23 1360 21054 8 1684 21055 - 20 8260 21056 + 20 8332 21056 9 9212 21058 19 2436 21059 19 2728 21063 @@ -2158,23 +2160,23 @@ 7 3444 21113 12 1196 21118 12 4400 21285 - 23 5976 21287 + 23 5648 21287 11 4340 21330 18 9012 21348 - 20 468 21368 + 20 540 21368 19 1272 21609 10 3616 21610 - 19 3544 21615 + 19 3576 21615 17 1940 21618 8 9132 21622 - 20 9040 21630 + 20 9112 21630 2 2048 21793 - 23 3000 21826 + 23 2672 21826 15 7456 21832 17 9580 21845 15 6104 21849 - 24 3228 21855 - 24 660 21856 + 24 2824 21855 + 24 256 21856 16 6216 21861 2 3472 21868 8 7548 21881 @@ -2197,15 +2199,15 @@ 9 5196 22320 9 9424 22325 22 7880 22335 - 24 3732 22340 - 20 64 22341 + 24 3328 22340 + 20 136 22341 17 5352 22342 12 6920 22363 16 8276 22372 8 312 22587 16 8212 22606 12 1728 22610 - 23 2392 22625 + 23 2064 22625 6 9920 22634 6 4072 22649 11 8648 22650 @@ -2213,10 +2215,10 @@ 3 2980 22820 15 4420 22824 6 8500 22859 - 23 3032 22898 + 23 2704 22898 15 7584 22903 - 20 2484 22906 - 24 5004 23096 + 20 2556 22906 + 24 4600 23096 2 4444 23102 16 4672 23105 18 7452 23109 @@ -2247,23 +2249,23 @@ 3 3932 23897 11 4132 23907 5 7560 24122 - 20 844 24128 + 20 916 24128 11 8616 24142 13 7560 24176 15 1252 24367 - 13 9444 24395 - 23 6388 24402 + 13 9476 24395 + 23 6060 24402 16 2328 24408 - 19 4656 24415 - 20 9660 24426 + 19 4688 24415 + 20 9732 24426 13 3484 24435 - 20 9200 24617 + 20 9272 24617 10 4384 24621 11 6152 24885 - 23 2520 24891 + 23 2192 24891 13 3804 24907 8 6868 25122 - 19 8328 25124 + 19 8392 25124 4 1456 25146 15 1284 25179 14 1604 25184 @@ -2279,20 +2281,20 @@ 17 8052 26150 13 3836 26152 2 3184 26166 - 19 7812 26178 + 19 7876 26178 5 2584 26179 2 3600 26180 3 7656 26181 17 5160 26183 11 6796 26184 18 9440 26185 - 24 6608 26186 + 24 6204 26186 10 5004 26192 4 3676 26214 23 160 26225 21 7044 26417 17 7988 26432 - 19 8100 26471 + 19 8164 26471 7 4972 26481 7 3060 26665 15 2064 26709 @@ -2300,27 +2302,27 @@ 7 3704 26723 4 9496 26746 22 8380 26952 - 20 5004 26953 + 20 5076 26953 14 9644 26973 21 7372 26982 16 7904 27205 - 24 5356 27206 + 24 4952 27206 3 5320 27215 - 20 1300 27223 - 24 4356 27235 + 20 1372 27223 + 24 3952 27235 13 192 27257 12 8252 27513 2 3312 27690 7 6620 27701 4 8300 27704 - 20 7224 27724 + 20 7296 27724 6 3512 27747 16 2232 27963 3 5840 27975 16 1716 28004 14 5460 28008 16 8468 28226 - 24 628 28240 + 24 224 28240 10 5892 28242 8 9100 28246 18 1456 28253 @@ -2329,16 +2331,16 @@ 14 8772 28468 22 9264 28473 4 7452 28496 - 20 7492 28505 + 20 7564 28505 11 5112 28524 18 3528 28538 9 5568 28714 14 2436 28722 - 19 6440 28726 + 19 6504 28726 4 7092 28778 9 8932 28783 11 5624 28984 - 24 2144 28995 + 24 1740 28995 3 8376 29020 11 8520 29025 12 6760 29028 @@ -2347,7 +2349,8 @@ 15 5056 29231 8 8312 29261 9 8632 29289 - 19 6120 29488 + 19 3452 29473 + 19 6184 29488 7 5392 29499 9 3428 29566 4 7676 29733 @@ -2358,7 +2361,7 @@ //Glyph index: list of element variants. [WORD: RecordID] [WORD: RecordOffset] [WORD: ElementID] //Several entries with the same ElementID means they are different variants //the RecordID and RecordOffset is where to find the glyph description for this Glyph - 3139 //number of index entry + 3141 //number of index entry 6 //size of one index entry 2 0 928 2 32 415 @@ -3958,29 +3961,30 @@ 13 8552 29 13 8584 542 13 8616 460 - 13 8648 257 - 13 8680 2575 - 13 8712 501 - 13 8744 859 - 13 8776 2468 - 13 8808 1220 - 13 9132 2582 - 13 9444 2867 - 13 9488 2069 - 13 9520 2911 - 13 9552 2827 - 13 9584 706 - 13 9616 989 + 13 8648 2957 + 13 8680 257 + 13 8712 2575 + 13 8744 501 + 13 8776 859 + 13 8808 2468 + 13 8840 1220 + 13 9164 2582 + 13 9476 2867 + 13 9520 2069 + 13 9552 2911 + 13 9584 2827 + 13 9616 706 13 9648 989 - 13 9680 1975 - 13 9712 949 - 13 9744 2745 + 13 9680 989 + 13 9712 1975 + 13 9744 949 13 9776 2745 - 13 9808 1887 - 13 9840 1041 - 13 9872 1554 - 13 9904 232 - 13 9936 94 + 13 9808 2745 + 13 9840 1887 + 13 9872 1041 + 13 9904 1554 + 13 9936 232 + 13 9968 94 14 0 2651 14 32 771 14 64 1734 @@ -4708,270 +4712,272 @@ 19 3356 641 19 3388 1154 19 3420 2121 - 19 3452 1423 - 19 3544 1274 - 19 3720 981 - 19 3800 1545 - 19 4044 389 - 19 4076 1628 - 19 4108 174 - 19 4140 892 - 19 4172 69 - 19 4204 2163 - 19 4236 2771 - 19 4464 369 - 19 4496 716 - 19 4528 287 - 19 4560 1614 - 19 4592 1161 - 19 4624 991 - 19 4656 907 - 19 4700 544 - 19 4732 993 - 19 4764 413 - 19 5012 413 - 19 5260 857 - 19 5292 2653 - 19 5324 1057 - 19 5540 670 - 19 5760 352 - 19 5792 2250 - 19 5824 882 - 19 5856 100 - 19 5888 2177 - 19 5920 2177 - 19 5952 796 - 19 5984 1108 - 19 6120 2882 - 19 6152 194 - 19 6184 1675 - 19 6216 259 - 19 6248 1732 - 19 6280 605 - 19 6312 503 - 19 6344 1238 - 19 6376 2015 - 19 6408 1564 - 19 6440 1051 - 19 6472 1847 - 19 6504 2356 - 19 6536 708 - 19 6636 1120 - 19 6668 536 - 19 6884 2779 - 19 6916 23 - 19 6948 35 - 19 6980 1973 - 19 7012 932 - 19 7044 462 - 19 7348 1571 - 19 7380 545 - 19 7412 1226 - 19 7444 149 - 19 7476 2376 - 19 7508 662 - 19 7672 2756 - 19 7704 2140 - 19 7736 1636 - 19 7768 2000 - 19 7812 2869 - 19 7844 1437 - 19 7876 1549 - 19 7908 1950 - 19 7940 1621 - 19 7972 1505 - 19 8004 2526 - 19 8036 2416 - 19 8068 1866 - 19 8100 1218 - 19 8328 2850 - 19 8360 968 - 19 8392 922 - 19 8424 108 - 19 8620 108 - 19 8816 2573 - 19 9180 2148 - 19 9212 2319 - 19 9244 773 - 19 9404 679 - 19 9436 2638 - 19 9856 842 - 19 9888 1740 - 19 9920 2905 - 19 9952 312 - 19 9984 2205 - 19 9992 1100 - 20 0 2466 - 20 32 1482 - 20 64 153 - 20 96 597 - 20 128 202 - 20 160 1295 - 20 192 454 - 20 224 781 - 20 256 368 - 20 288 43 - 20 404 2266 - 20 436 1579 - 20 468 553 - 20 572 553 - 20 676 553 - 20 780 1177 - 20 812 1690 - 20 844 2817 - 20 876 1520 - 20 908 2662 - 20 1172 1644 - 20 1204 1889 - 20 1236 1755 - 20 1268 2112 - 20 1300 2890 - 20 1332 2132 - 20 1376 2621 - 20 1408 353 - 20 1440 1992 - 20 1472 2042 - 20 1504 1468 - 20 1536 2699 - 20 1568 2340 - 20 1772 867 - 20 1956 2739 - 20 2000 1444 - 20 2032 731 - 20 2148 731 - 20 2292 731 - 20 2408 731 - 20 2484 2848 - 20 2516 303 - 20 2880 1965 - 20 2912 1720 - 20 3472 141 - 20 3504 2392 - 20 3536 1521 - 20 3568 84 - 20 3600 806 - 20 3632 2897 - 20 3664 1191 - 20 3708 1832 - 20 3740 614 - 20 3772 2331 - 20 3904 2087 - 20 3936 422 - 20 3968 2490 - 20 4000 1881 - 20 4188 2597 - 20 4220 1958 - 20 4252 438 - 20 4284 2156 - 20 4340 943 - 20 4372 2474 - 20 4404 296 - 20 4436 2645 - 20 4468 590 - 20 4500 2551 - 20 4532 1016 - 20 4564 1207 - 20 4596 788 - 20 4628 1824 - 20 4812 1311 - 20 4844 849 - 20 4876 1697 - 20 4908 2034 - 20 4940 1778 - 20 4972 1778 - 20 5004 1793 - 20 5036 178 - 20 5528 1065 - 20 5560 2230 - 20 5592 2764 - 20 5636 1126 - 20 5668 218 - 20 5700 1372 - 20 5732 951 - 20 5896 2564 - 20 5928 267 - 20 5960 2542 - 20 5992 1556 - 20 6024 1460 - 20 6056 1043 - 20 6088 1801 - 20 6120 1026 - 20 6152 2482 - 20 6184 1246 - 20 6216 429 - 20 6248 2291 - 20 6280 2185 - 20 6312 2825 - 20 6344 2400 - 20 6376 1529 - 20 6408 2067 - 20 6440 2580 - 20 6472 655 - 20 6504 511 - 20 6596 1303 - 20 6756 2008 - 20 6788 832 - 20 6820 2095 - 20 6852 1216 - 20 6884 1781 - 20 6916 446 - 20 6948 470 - 20 6980 1771 - 20 7012 958 - 20 7044 59 - 20 7224 1403 - 20 7256 1595 - 20 7288 2221 - 20 7320 569 - 20 7352 1429 - 20 7384 169 - 20 7416 2606 - 20 7460 1915 - 20 7492 2804 - 20 7524 1151 - 20 7556 1342 - 20 7648 1142 - 20 7680 1269 - 20 7828 2559 - 20 7860 234 - 20 7892 850 - 20 7924 68 - 20 7956 1713 - 20 8228 1854 - 20 8260 2678 - 20 8292 2518 - 20 8324 1364 - 20 8356 226 - 20 8388 915 - 20 8420 2116 - 20 8452 2425 - 20 8484 279 - 20 8528 2408 - 20 8608 2408 - 20 8688 2408 - 20 8768 2408 - 20 8848 1663 - 20 8880 1874 - 20 8912 2172 - 20 8944 2858 - 20 8976 2724 - 20 9008 630 - 20 9040 2937 - 20 9072 1943 - 20 9104 320 - 20 9136 2173 - 20 9168 2282 - 20 9200 755 - 20 9232 755 - 20 9264 2714 - 20 9628 405 - 20 9660 2951 - 20 9692 899 - 20 9724 1317 - 20 9756 1763 - 20 9788 2202 - 20 9820 2535 - 20 9852 7 + 19 3452 2958 + 19 3484 1423 + 19 3576 1274 + 19 3752 981 + 19 3832 1545 + 19 4076 389 + 19 4108 1628 + 19 4140 174 + 19 4172 892 + 19 4204 69 + 19 4236 2163 + 19 4268 2771 + 19 4496 369 + 19 4528 716 + 19 4560 287 + 19 4592 1614 + 19 4624 1161 + 19 4656 991 + 19 4688 907 + 19 4732 544 + 19 4764 993 + 19 4796 2959 + 19 4828 413 + 19 5076 413 + 19 5324 857 + 19 5356 2653 + 19 5388 1057 + 19 5604 670 + 19 5824 352 + 19 5856 2250 + 19 5888 882 + 19 5920 100 + 19 5952 2177 + 19 5984 2177 + 19 6016 796 + 19 6048 1108 + 19 6184 2882 + 19 6216 194 + 19 6248 1675 + 19 6280 259 + 19 6312 1732 + 19 6344 605 + 19 6376 503 + 19 6408 1238 + 19 6440 2015 + 19 6472 1564 + 19 6504 1051 + 19 6536 1847 + 19 6568 2356 + 19 6600 708 + 19 6700 1120 + 19 6732 536 + 19 6948 2779 + 19 6980 23 + 19 7012 35 + 19 7044 1973 + 19 7076 932 + 19 7108 462 + 19 7412 1571 + 19 7444 545 + 19 7476 1226 + 19 7508 149 + 19 7540 2376 + 19 7572 662 + 19 7736 2756 + 19 7768 2140 + 19 7800 1636 + 19 7832 2000 + 19 7876 2869 + 19 7908 1437 + 19 7940 1549 + 19 7972 1950 + 19 8004 1621 + 19 8036 1505 + 19 8068 2526 + 19 8100 2416 + 19 8132 1866 + 19 8164 1218 + 19 8392 2850 + 19 8424 968 + 19 8456 922 + 19 8488 108 + 19 8684 108 + 19 8880 2573 + 19 9244 2148 + 19 9276 2319 + 19 9308 773 + 19 9468 679 + 19 9500 2638 + 19 9920 842 + 19 9952 1740 + 19 9984 2905 + 20 0 312 + 20 32 2205 + 20 40 1100 + 20 72 2466 + 20 104 1482 + 20 136 153 + 20 168 597 + 20 200 202 + 20 232 1295 + 20 264 454 + 20 296 781 + 20 328 368 + 20 360 43 + 20 476 2266 + 20 508 1579 + 20 540 553 + 20 644 553 + 20 748 553 + 20 852 1177 + 20 884 1690 + 20 916 2817 + 20 948 1520 + 20 980 2662 + 20 1244 1644 + 20 1276 1889 + 20 1308 1755 + 20 1340 2112 + 20 1372 2890 + 20 1404 2132 + 20 1448 2621 + 20 1480 353 + 20 1512 1992 + 20 1544 2042 + 20 1576 1468 + 20 1608 2699 + 20 1640 2340 + 20 1844 867 + 20 2028 2739 + 20 2072 1444 + 20 2104 731 + 20 2220 731 + 20 2364 731 + 20 2480 731 + 20 2556 2848 + 20 2588 303 + 20 2952 1965 + 20 2984 1720 + 20 3544 141 + 20 3576 2392 + 20 3608 1521 + 20 3640 84 + 20 3672 806 + 20 3704 2897 + 20 3736 1191 + 20 3780 1832 + 20 3812 614 + 20 3844 2331 + 20 3976 2087 + 20 4008 422 + 20 4040 2490 + 20 4072 1881 + 20 4260 2597 + 20 4292 1958 + 20 4324 438 + 20 4356 2156 + 20 4412 943 + 20 4444 2474 + 20 4476 296 + 20 4508 2645 + 20 4540 590 + 20 4572 2551 + 20 4604 1016 + 20 4636 1207 + 20 4668 788 + 20 4700 1824 + 20 4884 1311 + 20 4916 849 + 20 4948 1697 + 20 4980 2034 + 20 5012 1778 + 20 5044 1778 + 20 5076 1793 + 20 5108 178 + 20 5600 1065 + 20 5632 2230 + 20 5664 2764 + 20 5708 1126 + 20 5740 218 + 20 5772 1372 + 20 5804 951 + 20 5968 2564 + 20 6000 267 + 20 6032 2542 + 20 6064 1556 + 20 6096 1460 + 20 6128 1043 + 20 6160 1801 + 20 6192 1026 + 20 6224 2482 + 20 6256 1246 + 20 6288 429 + 20 6320 2291 + 20 6352 2185 + 20 6384 2825 + 20 6416 2400 + 20 6448 1529 + 20 6480 2067 + 20 6512 2580 + 20 6544 655 + 20 6576 511 + 20 6668 1303 + 20 6828 2008 + 20 6860 832 + 20 6892 2095 + 20 6924 1216 + 20 6956 1781 + 20 6988 446 + 20 7020 470 + 20 7052 1771 + 20 7084 958 + 20 7116 59 + 20 7296 1403 + 20 7328 1595 + 20 7360 2221 + 20 7392 569 + 20 7424 1429 + 20 7456 169 + 20 7488 2606 + 20 7532 1915 + 20 7564 2804 + 20 7596 1151 + 20 7628 1342 + 20 7720 1142 + 20 7752 1269 + 20 7900 2559 + 20 7932 234 + 20 7964 850 + 20 7996 68 + 20 8028 1713 + 20 8300 1854 + 20 8332 2678 + 20 8364 2518 + 20 8396 1364 + 20 8428 226 + 20 8460 915 + 20 8492 2116 + 20 8524 2425 + 20 8556 279 + 20 8600 2408 + 20 8680 2408 + 20 8760 2408 + 20 8840 2408 + 20 8920 1663 + 20 8952 1874 + 20 8984 2172 + 20 9016 2858 + 20 9048 2724 + 20 9080 630 + 20 9112 2937 + 20 9144 1943 + 20 9176 320 + 20 9208 2173 + 20 9240 2282 + 20 9272 755 + 20 9304 755 + 20 9336 2714 + 20 9700 405 + 20 9732 2951 + 20 9764 899 + 20 9796 1317 + 20 9828 1763 + 20 9860 2202 + 20 9892 2535 + 20 9924 7 21 0 7 21 256 2457 21 288 1897 @@ -5289,216 +5295,215 @@ 23 1808 942 23 1840 512 23 1872 789 - 23 2064 184 - 23 2392 2763 - 23 2424 1756 - 23 2456 730 - 23 2488 1882 - 23 2520 2889 - 23 2552 1823 - 23 2584 1653 - 23 2616 2321 - 23 2648 1816 - 23 2680 235 - 23 2712 748 - 23 2744 2426 - 23 2776 1536 - 23 2808 1141 - 23 2840 1981 - 23 2872 2165 - 23 2904 1304 - 23 2936 1304 - 23 2968 681 - 23 3000 2938 - 23 3032 2859 - 23 3064 2048 - 23 3096 2677 - 23 3128 1942 - 23 3160 1259 - 23 3192 1772 - 23 3836 2733 - 23 3948 2560 - 23 3980 1343 - 23 4196 117 - 23 4232 117 - 23 4268 1985 - 23 4300 1914 - 23 4664 2686 - 23 4696 2607 - 23 4728 1469 - 23 5004 1024 - 23 5036 337 - 23 5092 1268 - 23 5168 1363 - 23 5200 58 - 23 5232 378 - 23 5264 2796 - 23 5296 319 - 23 5328 2174 - 23 5492 2283 - 23 5524 2614 - 23 5648 1662 - 23 5680 2212 - 23 5976 831 - 23 6008 2203 - 23 6356 2536 - 23 6388 2833 - 23 6432 756 - 23 6464 1430 - 23 6496 629 - 23 6528 294 - 23 6560 126 - 23 6756 126 - 23 6948 1512 - 23 6980 673 - 23 7012 580 - 23 7044 2715 - 23 7204 2952 - 23 7236 2725 - 23 7544 2401 - 23 7576 1594 - 23 7608 2812 - 23 7816 2812 - 23 8024 2025 - 23 8056 900 - 23 8112 2220 - 23 8400 2220 - 23 8688 2220 - 23 8976 1251 - 23 9008 1764 - 23 9040 244 - 23 9072 2519 - 23 9104 1150 - 23 9136 488 - 23 9520 874 - 23 9552 2115 - 23 9584 2157 - 23 9640 361 - 23 9672 2670 - 23 9704 2628 - 23 9912 2628 - 24 0 1377 - 24 32 570 - 24 64 1001 - 24 96 2094 - 24 404 2102 - 24 436 2384 - 24 468 1385 - 24 500 1721 - 24 532 1839 - 24 564 1898 - 24 596 67 - 24 628 2914 - 24 660 1209 - 24 692 445 - 24 920 2788 - 24 952 1318 - 24 1200 1318 - 24 1448 1082 - 24 1480 957 - 24 1628 638 - 24 1660 1689 - 24 1692 588 - 24 1724 2707 - 24 1756 336 - 24 1788 1034 - 24 1820 1926 - 24 1852 176 - 24 2112 2001 - 24 2144 2749 - 24 2188 1160 - 24 2220 697 - 24 2368 252 - 24 2400 924 - 24 2432 1800 - 24 2668 1586 - 24 2700 2754 - 24 2756 2502 - 24 2788 1236 - 24 2820 2241 - 24 2852 1859 - 24 2988 210 - 24 3020 75 - 24 3124 75 - 24 3228 1326 - 24 3332 1326 - 24 3436 1326 - 24 3540 1421 - 24 3572 1547 - 24 3604 1748 - 24 3636 722 - 24 3668 2439 - 24 3700 387 - 24 3732 975 - 24 3872 975 - 24 4012 975 - 24 4152 562 - 24 4184 412 - 24 4216 647 - 24 4248 2300 - 24 4292 2464 - 24 4324 2409 - 24 4356 2922 - 24 4388 1074 - 24 4420 1169 - 24 4452 1489 - 24 4472 2237 - 24 4504 1287 - 24 4536 185 - 24 4716 185 - 24 4896 1606 - 24 4928 227 - 24 4960 740 - 24 5004 2930 - 24 5036 151 - 24 5068 1133 - 24 5100 2123 - 24 5132 2258 - 24 5164 2258 - 24 5196 8 - 24 5228 2009 - 24 5260 1646 - 24 5292 1934 - 24 5324 983 - 24 5356 2770 - 24 5400 2418 - 24 5592 2346 - 24 5624 1906 - 24 5656 134 - 24 5688 916 - 24 5720 2589 - 24 5752 2178 - 24 5888 2691 - 24 5920 1788 - 24 5952 1665 - 24 6100 395 - 24 6328 1093 - 24 6360 2636 - 24 6544 2447 - 24 6576 1276 - 24 6608 2875 - 24 6640 50 - 24 6672 1413 - 24 6704 521 - 24 6736 890 - 24 6768 764 - 24 6800 604 - 24 6832 2510 - 24 6864 622 - 24 6896 471 - 24 6928 328 - 24 6960 109 - 24 6992 1402 - 24 7024 92 - 24 7056 2456 - 24 7088 404 - 24 7120 1497 - 24 7152 1705 - 24 7184 2195 - 24 7216 1200 - 24 7248 1855 - 24 7280 2077 - 24 7312 2363 + 23 2064 2763 + 23 2096 1756 + 23 2128 730 + 23 2160 1882 + 23 2192 2889 + 23 2224 1823 + 23 2256 1653 + 23 2288 2321 + 23 2320 1816 + 23 2352 235 + 23 2384 748 + 23 2416 2426 + 23 2448 1536 + 23 2480 1141 + 23 2512 1981 + 23 2544 2165 + 23 2576 1304 + 23 2608 1304 + 23 2640 681 + 23 2672 2938 + 23 2704 2859 + 23 2736 2048 + 23 2768 2677 + 23 2800 1942 + 23 2832 1259 + 23 2864 1772 + 23 3508 2733 + 23 3620 2560 + 23 3652 1343 + 23 3868 117 + 23 3904 117 + 23 3940 1985 + 23 3972 1914 + 23 4336 2686 + 23 4368 2607 + 23 4400 1469 + 23 4676 1024 + 23 4708 337 + 23 4764 1268 + 23 4840 1363 + 23 4872 58 + 23 4904 378 + 23 4936 2796 + 23 4968 319 + 23 5000 2174 + 23 5164 2283 + 23 5196 2614 + 23 5320 1662 + 23 5352 2212 + 23 5648 831 + 23 5680 2203 + 23 6028 2536 + 23 6060 2833 + 23 6104 756 + 23 6136 1430 + 23 6168 629 + 23 6200 294 + 23 6232 126 + 23 6428 126 + 23 6620 1512 + 23 6652 673 + 23 6684 580 + 23 6716 2715 + 23 6876 2952 + 23 6908 2725 + 23 7216 2401 + 23 7248 1594 + 23 7280 2812 + 23 7488 2812 + 23 7696 2025 + 23 7728 900 + 23 7784 2220 + 23 8072 2220 + 23 8360 2220 + 23 8648 1251 + 23 8680 1764 + 23 8712 244 + 23 8744 2519 + 23 8776 1150 + 23 8808 488 + 23 9192 874 + 23 9224 2115 + 23 9256 2157 + 23 9312 361 + 23 9344 2670 + 23 9376 2628 + 23 9584 2628 + 23 9808 1377 + 23 9840 570 + 23 9872 1001 + 23 9904 2094 + 24 0 2102 + 24 32 2384 + 24 64 1385 + 24 96 1721 + 24 128 1839 + 24 160 1898 + 24 192 67 + 24 224 2914 + 24 256 1209 + 24 288 445 + 24 516 2788 + 24 548 1318 + 24 796 1318 + 24 1044 1082 + 24 1076 957 + 24 1224 638 + 24 1256 1689 + 24 1288 588 + 24 1320 2707 + 24 1352 336 + 24 1384 1034 + 24 1416 1926 + 24 1448 176 + 24 1708 2001 + 24 1740 2749 + 24 1784 1160 + 24 1816 697 + 24 1964 252 + 24 1996 924 + 24 2028 1800 + 24 2264 1586 + 24 2296 2754 + 24 2352 2502 + 24 2384 1236 + 24 2416 2241 + 24 2448 1859 + 24 2584 210 + 24 2616 75 + 24 2720 75 + 24 2824 1326 + 24 2928 1326 + 24 3032 1326 + 24 3136 1421 + 24 3168 1547 + 24 3200 1748 + 24 3232 722 + 24 3264 2439 + 24 3296 387 + 24 3328 975 + 24 3468 975 + 24 3608 975 + 24 3748 562 + 24 3780 412 + 24 3812 647 + 24 3844 2300 + 24 3888 2464 + 24 3920 2409 + 24 3952 2922 + 24 3984 1074 + 24 4016 1169 + 24 4048 1489 + 24 4068 2237 + 24 4100 1287 + 24 4132 185 + 24 4312 185 + 24 4492 1606 + 24 4524 227 + 24 4556 740 + 24 4600 2930 + 24 4632 151 + 24 4664 1133 + 24 4696 2123 + 24 4728 2258 + 24 4760 2258 + 24 4792 8 + 24 4824 2009 + 24 4856 1646 + 24 4888 1934 + 24 4920 983 + 24 4952 2770 + 24 4996 2418 + 24 5188 2346 + 24 5220 1906 + 24 5252 134 + 24 5284 916 + 24 5316 2589 + 24 5348 2178 + 24 5484 2691 + 24 5516 1788 + 24 5548 1665 + 24 5696 395 + 24 5924 1093 + 24 5956 2636 + 24 6140 2447 + 24 6172 1276 + 24 6204 2875 + 24 6236 50 + 24 6268 1413 + 24 6300 521 + 24 6332 890 + 24 6364 764 + 24 6396 604 + 24 6428 2510 + 24 6460 622 + 24 6492 471 + 24 6524 328 + 24 6556 109 + 24 6588 1402 + 24 6620 92 + 24 6652 2456 + 24 6684 404 + 24 6716 1497 + 24 6748 1705 + 24 6780 2195 + 24 6812 1200 + 24 6844 1855 + 24 6876 2077 + 24 6908 2363 end; record begin @@ -5514,7 +5519,7 @@ 100 //glyph height begin dec word - 23 5680 + 23 5352 0 0 100 50 end begin @@ -5669,7 +5674,7 @@ 100 //glyph height begin dec word - 23 4196 + 23 3868 0 5 100 10 end begin @@ -5690,7 +5695,7 @@ 100 //glyph height begin dec word - 23 4196 + 23 3868 0 5 100 10 end begin @@ -5749,7 +5754,7 @@ 100 //glyph height begin dec word - 20 7680 + 20 7752 0 0 38 100 end begin @@ -5850,7 +5855,7 @@ end begin dec word - 19 8424 + 19 8488 50 0 50 100 end end @@ -5871,7 +5876,7 @@ end begin dec word - 24 4472 + 24 4068 0 26 100 73 end end @@ -5887,7 +5892,7 @@ 100 //glyph height begin dec word - 20 908 + 20 980 0 0 100 55 end begin @@ -5967,7 +5972,7 @@ end begin dec word - 20 6504 + 20 6576 50 0 45 100 end end @@ -5988,7 +5993,7 @@ end begin dec word - 24 4716 + 24 4312 0 -40 100 145 end end @@ -6213,7 +6218,7 @@ 100 //glyph height begin dec word - 20 7556 + 20 7628 19 7 62 31 end begin @@ -6239,7 +6244,7 @@ 100 //glyph height begin dec word - 20 7556 + 20 7628 15 7 70 31 end begin @@ -6265,7 +6270,7 @@ 100 //glyph height begin dec word - 20 7556 + 20 7628 14 7 72 31 end begin @@ -6317,7 +6322,7 @@ end begin dec word - 20 1772 + 20 1844 0 0 100 100 end end @@ -6375,7 +6380,7 @@ 100 //glyph height begin dec word - 24 2852 + 24 2448 10 0 80 35 end begin @@ -6464,7 +6469,7 @@ end begin dec word - 19 3800 + 19 3832 50 0 50 100 end end @@ -6501,7 +6506,7 @@ 100 //glyph height begin dec word - 24 3228 + 24 2824 0 0 100 43 end begin @@ -6690,7 +6695,7 @@ 100 //glyph height begin dec word - 19 3720 + 19 3752 0 0 25 100 end begin @@ -6872,7 +6877,7 @@ end begin dec word - 23 4196 + 23 3868 5 86 55 10 end end @@ -7010,7 +7015,7 @@ 100 //glyph height begin dec word - 24 3332 + 24 2928 0 0 100 30 end begin @@ -7103,7 +7108,7 @@ 100 //glyph height begin dec word - 23 8400 + 23 8072 0 0 100 100 end begin @@ -7209,7 +7214,7 @@ end begin dec word - 23 9704 + 23 9376 0 42 100 55 end end @@ -7288,7 +7293,7 @@ 100 //glyph height begin dec word - 24 3332 + 24 2928 0 0 100 30 end begin @@ -7378,7 +7383,7 @@ 100 //glyph height begin dec word - 19 3720 + 19 3752 0 0 25 100 end begin @@ -7741,7 +7746,7 @@ 100 //glyph height begin dec word - 20 2516 + 20 2588 0 0 100 63 end begin @@ -7762,7 +7767,7 @@ 100 //glyph height begin dec word - 13 9132 + 13 9164 0 0 50 100 end begin @@ -7830,12 +7835,12 @@ end begin dec word - 19 3720 + 19 3752 30 0 26 100 end begin dec word - 24 1852 + 24 1448 54 0 42 100 end end @@ -7851,7 +7856,7 @@ 100 //glyph height begin dec word - 19 3720 + 19 3752 0 0 25 100 end begin @@ -7893,12 +7898,12 @@ 100 //glyph height begin dec word - 19 3452 + 19 3484 0 0 30 100 end begin dec word - 20 2000 + 20 2072 25 0 75 100 end end @@ -7914,7 +7919,7 @@ 100 //glyph height begin dec word - 20 468 + 20 540 0 0 100 100 end begin @@ -8024,7 +8029,7 @@ end begin dec word - 20 224 + 20 296 30 0 70 100 end end @@ -8092,12 +8097,12 @@ 100 //glyph height begin dec word - 13 9132 + 13 9164 2 0 40 100 end begin dec word - 23 4300 + 23 3972 38 0 60 100 end end @@ -8167,7 +8172,7 @@ 100 //glyph height begin dec word - 13 9132 + 13 9164 2 0 45 100 end begin @@ -8412,7 +8417,7 @@ 100 //glyph height begin dec word - 24 3332 + 24 2928 0 3 100 30 end begin @@ -8459,7 +8464,7 @@ end begin dec word - 23 9040 + 23 8712 7 41 93 59 end end @@ -8507,7 +8512,7 @@ end begin dec word - 19 7044 + 19 7108 0 0 100 100 end end @@ -8617,7 +8622,7 @@ 100 //glyph height begin dec word - 24 3332 + 24 2928 5 4 90 29 end begin @@ -8657,7 +8662,7 @@ 100 //glyph height begin dec word - 19 3720 + 19 3752 0 0 25 100 end begin @@ -8756,7 +8761,7 @@ 100 //glyph height begin dec word - 19 3720 + 19 3752 0 0 25 100 end begin @@ -9017,7 +9022,7 @@ end begin dec word - 20 6504 + 20 6576 28 0 72 100 end end @@ -9038,7 +9043,7 @@ end begin dec word - 20 9232 + 20 9304 25 0 75 100 end end @@ -9179,7 +9184,7 @@ 100 //glyph height begin dec word - 23 8112 + 23 7784 0 0 100 100 end begin @@ -9200,7 +9205,7 @@ 100 //glyph height begin dec word - 23 8688 + 23 8360 0 0 100 100 end begin @@ -9321,12 +9326,12 @@ 100 //glyph height begin dec word - 20 9852 + 20 9924 0 0 52 100 end begin dec word - 20 9852 + 20 9924 40 0 58 100 end end @@ -9342,12 +9347,12 @@ 100 //glyph height begin dec word - 19 3452 + 19 3484 0 0 30 100 end begin dec word - 23 5004 + 23 4676 30 0 70 100 end end @@ -9430,7 +9435,7 @@ 100 //glyph height begin dec word - 24 3228 + 24 2824 0 -15 100 70 end begin @@ -9440,7 +9445,7 @@ end begin dec word - 24 5100 + 24 4696 0 60 100 35 end end @@ -9552,7 +9557,7 @@ 100 //glyph height begin dec word - 13 9132 + 13 9164 2 0 35 100 end begin @@ -9615,7 +9620,7 @@ 100 //glyph height begin dec word - 24 3332 + 24 2928 0 3 100 30 end begin @@ -9657,7 +9662,7 @@ 100 //glyph height begin dec word - 19 3720 + 19 3752 0 0 25 100 end begin @@ -9678,7 +9683,7 @@ 100 //glyph height begin dec word - 19 3720 + 19 3752 0 0 25 100 end begin @@ -9729,7 +9734,7 @@ end begin dec word - 24 7152 + 24 6748 34 0 64 100 end end @@ -10042,7 +10047,7 @@ 100 //glyph height begin dec word - 13 9132 + 13 9164 0 0 43 100 end begin @@ -10170,7 +10175,7 @@ 100 //glyph height begin dec word - 20 4596 + 20 4668 0 4 100 30 end beg... [truncated message content] |
|
From: <ben...@us...> - 2006-05-17 23:54:21
|
Revision: 744 Author: benoitcerrina Date: 2006-05-17 16:53:56 -0700 (Wed, 17 May 2006) ViewCVS: http://svn.sourceforge.net/padict/?rev=744&view=rev Log Message: ----------- add JIS 0x4566 to taka and jstroke Modified Paths: -------------- branches/unstable/padict/CHANGELOG branches/unstable/padict/stroke/unistrok.8 branches/unstable/padict/taka/taka.pdbc Modified: branches/unstable/padict/CHANGELOG =================================================================== --- branches/unstable/padict/CHANGELOG 2006-05-14 12:56:06 UTC (rev 743) +++ branches/unstable/padict/CHANGELOG 2006-05-17 23:53:56 UTC (rev 744) @@ -16,13 +16,13 @@ modified JIS: 0x3E21, 0x4849, 0x402F, 0x317C, 0x3A57, 0x4424, 0x4268, 0x446F, 0x497E, 0x387A, 0x394D, 0x3B65 added: -JIS: 0x4f35, 0x5f6a, 0x3d6c, 0x3262, 0x3264, 0x4d4c, 0x7321 +JIS: 0x4f35, 0x5f6a, 0x3d6c, 0x3262, 0x3264, 0x4d4c, 0x7321, 0x4566 JStroke corrections: add variants JIS: 0x316e, 0x3851, 0x472d add -JIS: 0x4f35, 0x5f6a, 0x3d6c, 0x3262, 0x3264, 0x4d4c, 0x7321 +JIS: 0x4f35, 0x5f6a, 0x3d6c, 0x3262, 0x3264, 0x4d4c, 0x7321, 0x4566 0.3.3 => 0.9.0 support larger dictionary Modified: branches/unstable/padict/stroke/unistrok.8 =================================================================== --- branches/unstable/padict/stroke/unistrok.8 2006-05-14 12:56:06 UTC (rev 743) +++ branches/unstable/padict/stroke/unistrok.8 2006-05-17 23:53:56 UTC (rev 744) @@ -36,11 +36,13 @@ 62b1 306 | 6 2 9 1 b7 b 6 c | j2-y3 62d0 308 | 6 2 9 2 b 6 627 x | j2-y3 62d0 308 | 6 2 9 2 b 6 627 1 | j2-y3 +#Benoit Cerrina add filter 62e1 309 | 6 2 9 2 6 x 16 3 | j2-y3 y1-y2! 62d8 310 | 6 2 9 1 b7 2 b 6 | j2-y3 62d2 311 | 6 2 9 2 6 b 6 6 | j2-y3 62e0 312 | 6 2 9 x 6x y x 6c | j2-y3 62b9 313 | 6 2 9 6 6 2 1 3 | j2-y3 +#Benoit Cerrina add filter 62bc 314 | 6 2 9 2 b 6 6 2 | j2-y3 j5-j6! j4-y6! b6-y8! b7-y8! 62d9 315 | 6 2 9 2 c 2 c 2 | j2-y3 62db 316 | 6 2 9 627 x 2 b 6 | j2-y3 @@ -76,10 +78,9 @@ 6240 851 | 6 b 6 x 1 x 6 2 653e 853 | 2 6 b7 x 1 6 x y 676f 857 | 6 2 1 3 6 1 2 3 - +#Benoit Cerrina Add Variant filter 679d 863 | 6 2 1 3 6 2 6x y | x6-x5! y5-y6! 679d 863 | 6 2 1 3 6 2 61 y | x6-x5! y5-y6! - 677e 864 | 6 2 1 3 1 3 16 3 67a2 865 | 6 2 1 3 6 1 3 c 67a0 866 | 6 2 1 3 x 6c 6 2 @@ -99,7 +100,7 @@ 80a2 882 | x b 6 6 6 2 61 3 6bb4 886 | 6 x 3 c x c 61 3 6b27 887 | 6 x 3 c 1 61 x 3 - +#Benoit Cerrina add filter 9580 888 | 2 b 6 6 2 b 6 6 | j1-j5! 975e 889 | x 6 6 9 2 6 6 6 @@ -237,6 +238,8 @@ # A, O, omone - Africa; flatter; fawn upon; corner; nook; recess 963f 0000 | 61 34 2 6 2 2 b 6 +################################ +# Modifications by Benoit Cerrina #Benoit Cerrina add filter 7684 1125 | 1 2 b 6 6 1 b7 3 | y5-y7! # HAKU, kine - cloth @@ -315,3 +318,6 @@ 677f 0 | 6 2 1 3 6 x 61 3 679a 0 | 6 2 1 3 1 6 1 3 6797 0 | 6 2 1 3 6 2 1 3 +#Benoit Cerrina add kanji +#TOU sugiru cave +5b95 0 | 2 1 6 1 6 1 2 b 6 Modified: branches/unstable/padict/taka/taka.pdbc =================================================================== --- branches/unstable/padict/taka/taka.pdbc 2006-05-14 12:56:06 UTC (rev 743) +++ branches/unstable/padict/taka/taka.pdbc 2006-05-17 23:53:56 UTC (rev 744) @@ -13,2346 +13,2346 @@ 6 //size of one index entry //Character index: list of characters. [WORD: RecordID] [WORD: RecordOffset] [WORD: JisCode] //the RecordID and RecordOffset is where to find the glyph description for this character - 5 6736 8505 + 5 6576 8505 4 4312 12321 - 20 6988 12325 - 20 4356 12326 - 21 4732 12329 - 21 6540 12333 + 20 6628 12325 + 20 3996 12326 + 21 4476 12329 + 21 6284 12333 2 5868 12334 - 19 6216 12341 - 5 9192 12343 - 18 6064 12344 - 23 4968 12351 - 18 1520 12354 - 18 8476 12357 - 6 5868 12358 - 10 1160 12362 + 19 5844 12341 + 5 9032 12343 + 18 5704 12344 + 23 4792 12351 + 18 1160 12354 + 18 8116 12357 + 6 5688 12358 + 10 800 12362 2 6292 12364 - 22 3076 12365 - 16 536 12366 + 22 2772 12365 + 16 336 12366 2 8760 12367 - 6 1072 12368 + 6 892 12368 24 3136 12369 - 11 2096 12370 - 21 7436 12371 - 16 2520 12373 - 8 632 12374 - 11 3908 12375 - 23 8808 12377 + 11 1660 12370 + 21 7180 12371 + 16 2320 12373 + 8 384 12374 + 11 3472 12375 + 23 8600 12377 24 6876 12379 - 23 1200 12380 - 9 9912 12381 + 23 696 12380 + 9 9592 12381 2 9576 12382 - 20 6448 12383 - 6 4648 12385 - 18 3420 12387 - 6 2060 12388 - 19 5888 12389 - 9 3760 12390 - 23 224 12391 - 20 8952 12392 - 7 3188 12393 - 23 3868 12396 - 5 780 12397 - 5 684 12399 - 22 6812 12400 - 9 1380 12402 - 6 7120 12404 - 18 8092 12405 - 12 9248 12407 - 13 764 12408 - 12 7412 12409 - 10 7808 12410 - 18 9792 12411 - 21 1164 12577 - 13 636 12578 - 15 1660 12579 - 18 9408 12580 - 22 2164 12582 - 9 6572 12583 - 22 984 12585 - 14 9868 12587 + 20 6088 12383 + 6 4468 12385 + 18 3060 12387 + 6 1880 12388 + 19 5516 12389 + 9 3440 12390 + 22 9936 12391 + 20 8592 12392 + 7 2984 12393 + 23 3692 12396 + 5 620 12397 + 5 524 12399 + 22 6508 12400 + 9 1060 12402 + 6 6940 12404 + 18 7732 12405 + 12 8876 12407 + 13 476 12408 + 12 7040 12409 + 10 7372 12410 + 18 9432 12411 + 21 908 12577 + 13 348 12578 + 15 1376 12579 + 18 9048 12580 + 22 1860 12582 + 9 6252 12583 + 22 680 12585 + 14 9572 12587 4 9892 12589 - 20 1640 12593 - 16 4928 12594 - 7 3124 12602 - 10 9088 12603 - 16 7004 12604 - 10 0 12606 + 20 1280 12593 + 16 4728 12594 + 7 2920 12602 + 10 8652 12603 + 16 6804 12604 + 9 9688 12606 24 160 12607 - 12 6600 12608 - 17 1272 12612 - 5 7984 12614 - 17 3204 12615 - 6 5932 12617 - 10 1752 12618 - 9 8900 12619 - 16 9328 12625 - 13 3612 12626 + 12 6228 12608 + 17 980 12612 + 5 7824 12614 + 17 2912 12615 + 6 5752 12617 + 10 1392 12618 + 9 8580 12619 + 16 9128 12625 + 13 3292 12626 4 3124 12627 - 16 7520 12628 - 9 4416 12629 + 16 7320 12628 + 9 4096 12629 24 3232 12630 - 14 760 12631 - 21 5072 12632 - 16 4832 12633 - 20 2952 12634 - 6 1836 12635 - 15 912 12636 + 14 464 12631 + 21 4816 12632 + 16 4632 12633 + 20 2592 12634 + 6 1656 12635 + 15 628 12636 2 428 12639 - 22 9232 12640 - 18 3484 12643 - 20 8364 12644 - 10 9596 12647 + 22 8928 12640 + 18 3124 12643 + 20 8004 12644 + 10 9160 12647 4 5944 12648 - 21 4636 12649 - 11 6892 12650 - 11 3624 12652 - 15 2932 12654 - 7 2636 12655 - 10 7712 12659 - 16 1004 12660 - 10 9628 12662 - 11 2404 12664 + 21 4380 12649 + 11 6456 12650 + 11 3188 12652 + 15 2648 12654 + 7 2432 12655 + 10 7276 12659 + 16 804 12660 + 10 9192 12662 + 11 1968 12664 3 9200 12665 - 10 5260 12666 - 9 8396 12667 - 6 3544 12668 - 23 1328 12669 - 11 4036 12670 - 5 1892 12833 - 16 4960 12835 - 14 1712 12836 + 10 4824 12666 + 9 8076 12667 + 6 3364 12668 + 23 824 12669 + 11 3600 12670 + 5 1732 12833 + 16 4760 12835 + 14 1416 12836 3 3076 12837 - 16 3448 12838 - 5 8808 12839 - 16 8500 12843 - 6 1740 12844 - 18 860 12845 + 16 3248 12838 + 5 8648 12839 + 16 8300 12843 + 6 1560 12844 + 18 500 12845 24 3888 12847 - 12 972 12848 - 19 4172 12849 - 14 792 12853 - 17 5320 12855 - 20 4444 12856 - 13 8552 12857 - 12 8028 12858 - 20 8028 12859 + 12 600 12848 + 19 3800 12849 + 14 496 12853 + 17 5028 12855 + 20 4084 12856 + 13 8232 12857 + 12 7656 12858 + 20 7668 12859 3 1808 12860 - 22 4236 12861 - 14 296 12862 - 13 9520 12863 + 22 3932 12861 + 14 0 12862 + 13 9200 12863 4 2124 12864 - 11 1860 12865 - 20 9080 12866 - 11 7836 12867 - 13 9648 12868 + 11 1424 12865 + 20 8720 12866 + 11 7400 12867 + 13 9328 12868 4 2904 12870 - 5 2852 12871 - 9 9752 12872 + 5 2692 12871 + 9 9432 12872 3 5384 12873 - 21 4860 12874 - 20 1512 12875 - 23 4400 12876 - 8 1588 12877 - 6 8852 12878 - 13 3900 12879 - 16 7132 12880 - 20 6256 12882 - 18 2868 12883 + 21 4604 12874 + 20 1152 12875 + 23 4224 12876 + 8 1340 12877 + 6 8672 12878 + 13 3580 12879 + 16 6932 12880 + 20 5896 12882 + 18 2508 12883 24 128 12884 24 4888 12885 - 9 8600 12886 - 17 2004 12888 - 6 8916 12889 - 16 1036 12890 - 21 4892 12891 - 9 5472 12893 - 16 9784 12895 - 18 1584 12897 - 23 6876 12898 + 9 8280 12886 + 17 1712 12888 + 6 8736 12889 + 16 836 12890 + 21 4636 12891 + 9 5152 12893 + 16 9584 12895 + 18 1224 12897 5 332 12899 - 13 8648 12900 - 11 7260 12902 + 13 8328 12900 + 11 6824 12902 3 8044 12903 - 16 9496 12904 - 6 2092 12906 + 16 9296 12904 + 6 1912 12906 2 9544 12908 - 22 2752 12909 - 6 5804 12910 - 6 2252 12912 + 22 2448 12909 + 6 5624 12910 + 6 2072 12912 4 3356 12913 - 16 7552 12914 - 12 8920 12915 - 21 2792 12916 + 16 7352 12914 + 12 8548 12915 + 21 2536 12916 4 6040 12917 - 8 8740 12919 - 8 9036 12920 + 8 8492 12919 + 8 8788 12920 3 5020 12921 - 11 3592 12923 + 11 3156 12923 24 0 12924 - 22 8220 12925 - 9 7384 12926 - 7 9712 13091 + 22 7916 12925 + 9 7064 12926 + 7 9476 13091 4 2376 13092 - 16 200 13093 - 12 3344 13094 - 20 296 13095 + 16 0 13093 + 12 2972 13094 + 19 9940 13095 3 7980 13096 - 11 9180 13099 + 11 8744 13099 2 8920 13100 - 11 2884 13101 - 7 5776 13103 - 9 3600 13104 - 20 3704 13105 - 5 7876 13106 - 21 7772 13108 - 10 8000 13109 - 18 956 13110 - 22 856 13113 - 18 9952 13114 - 14 4536 13116 + 11 2448 13101 + 7 5572 13103 + 9 3280 13104 + 20 3344 13105 + 5 7716 13106 + 21 7516 13108 + 10 7564 13109 + 18 596 13110 + 22 552 13113 + 18 9592 13114 + 14 4240 13116 5 64 13120 2 8888 13125 2 6584 13126 - 10 1052 13128 - 16 2744 13130 - 18 8060 13131 - 14 5760 13132 - 12 8748 13133 - 14 2732 13134 - 22 2132 13135 - 12 564 13136 - 7 8560 13137 - 11 7020 13138 - 7 4052 13139 + 10 692 13128 + 16 2544 13130 + 18 7700 13131 + 14 5464 13132 + 12 8376 13133 + 14 2436 13134 + 22 1828 13135 + 12 192 13136 + 7 8356 13137 + 11 6584 13138 + 7 3848 13139 24 4100 13140 - 9 2732 13141 - 11 9400 13142 - 21 7500 13143 - 10 3960 13144 - 6 6656 13145 - 17 1000 13146 - 6 6124 13147 - 20 3736 13149 - 17 7144 13155 - 14 96 13156 - 16 4768 13157 - 12 8640 13159 - 21 8892 13160 + 9 2412 13141 + 11 8964 13142 + 21 7244 13143 + 10 3600 13144 + 6 6476 13145 + 17 708 13146 + 6 5944 13147 + 20 3376 13149 + 17 6852 13155 + 13 9892 13156 + 16 4568 13157 + 12 8268 13159 + 21 8668 13160 2 696 13161 - 19 6248 13162 - 15 6880 13164 - 22 4300 13165 - 21 5456 13166 - 5 8080 13172 + 19 5876 13162 + 15 6596 13164 + 22 3996 13165 + 21 5200 13166 + 5 7920 13172 3 3012 13175 - 15 6540 13176 - 9 4480 13177 - 17 936 13346 - 12 3140 13349 - 11 5912 13351 - 22 6780 13352 - 5 7624 13353 + 15 6256 13176 + 9 4160 13177 + 17 644 13346 + 12 2768 13349 + 11 5476 13351 + 22 6476 13352 + 5 7464 13353 2 3248 13354 - 21 7076 13355 - 15 6912 13356 - 5 8712 13357 - 18 4412 13358 - 9 3536 13360 - 15 1092 13361 - 21 3632 13362 - 20 6576 13363 - 10 2028 13364 - 12 3772 13365 - 11 1924 13366 - 12 1004 13367 - 6 5740 13368 - 14 8376 13369 - 5 1796 13370 + 21 6820 13355 + 15 6628 13356 + 5 8552 13357 + 18 4052 13358 + 9 3216 13360 + 15 808 13361 + 21 3376 13362 + 20 6216 13363 + 10 1668 13364 + 12 3400 13365 + 11 1488 13366 + 12 632 13367 + 6 5560 13368 + 14 8080 13369 + 5 1636 13370 3 8440 13373 - 23 9224 13374 - 13 8616 13375 + 23 9016 13374 + 13 8296 13375 3 3108 13376 - 6 6028 13377 - 17 1972 13380 + 6 5848 13377 + 17 1680 13380 24 1076 13381 3 2948 13382 - 20 9176 13383 - 17 4708 13385 - 13 6092 13386 - 10 1020 13387 - 22 4756 13388 - 6 1932 13390 - 8 3868 13391 - 14 5792 13393 - 13 3644 13395 - 11 3876 13396 - 22 9136 13397 + 20 8816 13383 + 17 4416 13385 + 13 5772 13386 + 10 660 13387 + 22 4452 13388 + 6 1752 13390 + 8 3620 13391 + 14 5496 13393 + 13 3324 13395 + 11 3440 13396 + 22 8832 13397 2 5544 13398 - 13 3868 13399 - 9 488 13400 - 11 8892 13401 - 13 2640 13403 - 19 3832 13405 - 8 344 13406 - 18 7900 13407 - 5 1956 13410 - 19 5324 13411 + 13 3548 13399 + 9 168 13400 + 11 8456 13401 + 13 2320 13403 + 19 3460 13405 + 8 96 13406 + 18 7540 13407 + 5 1796 13410 + 19 4952 13411 2 6260 13412 - 22 9856 13413 + 22 9552 13413 4 6440 13416 - 17 2852 13417 - 19 7940 13418 - 18 2032 13419 - 9 5504 13421 - 18 2664 13422 - 15 3976 13423 - 19 7012 13424 - 18 2632 13425 + 17 2560 13417 + 19 7568 13418 + 18 1672 13419 + 9 5184 13421 + 18 2304 13422 + 15 3692 13423 + 19 6640 13424 + 18 2272 13425 2 5964 13427 4 1984 13428 24 2264 13429 - 16 7036 13430 - 21 2492 13431 - 18 5336 13432 - 21 6852 13433 - 11 8552 13434 - 12 2480 13435 - 13 3932 13436 - 12 7828 13437 - 8 760 13438 - 22 400 13601 - 15 8452 13602 + 16 6836 13430 + 21 2236 13431 + 18 4976 13432 + 21 6596 13433 + 11 8116 13434 + 12 2108 13435 + 13 3612 13436 + 12 7456 13437 + 8 512 13438 + 22 96 13601 + 15 8168 13602 3 9804 13604 - 17 7596 13605 + 17 7304 13605 2 4348 13607 - 18 892 13608 - 11 3228 13610 - 7 2732 13612 - 15 6816 13613 - 14 4936 13614 - 20 6828 13615 - 7 924 13616 + 18 532 13608 + 11 2792 13610 + 7 2528 13612 + 15 6532 13613 + 14 4640 13614 + 20 6468 13615 + 7 720 13616 4 0 13617 - 11 1644 13618 - 6 2124 13619 + 11 1208 13618 + 6 1944 13619 2 9072 13620 - 18 6556 13621 + 18 6196 13621 24 5924 13622 - 13 6124 13623 - 13 7624 13625 - 15 2996 13626 - 12 8316 13627 + 13 5804 13623 + 13 7304 13625 + 15 2712 13626 + 12 7944 13627 2 8856 13628 - 23 2128 13629 - 20 3640 13630 - 11 9368 13631 - 13 2304 13633 - 13 5204 13636 - 14 728 13638 - 12 8188 13640 - 22 3576 13642 + 23 1952 13629 + 20 3280 13630 + 11 8932 13631 + 13 1984 13633 + 13 4884 13636 + 14 432 13638 + 12 7816 13640 + 22 3272 13642 4 1952 13644 3 2412 13645 - 22 4724 13649 + 22 4420 13649 24 6812 13650 - 15 6572 13651 + 15 6288 13651 24 5252 13652 - 22 8284 13653 - 11 7672 13654 - 11 1676 13655 - 20 6032 13657 - 15 6944 13658 + 22 7980 13653 + 11 7236 13654 + 11 1240 13655 + 20 5672 13657 + 15 6660 13658 2 3536 13659 4 3484 13660 - 14 8064 13661 - 11 436 13662 - 21 2824 13663 + 14 7768 13661 + 11 0 13662 + 21 2568 13663 24 6620 13664 - 10 7388 13665 - 22 4364 13667 - 6 3672 13668 - 18 5400 13669 - 15 7952 13670 - 18 3656 13671 - 14 9612 13673 - 12 8672 13674 - 12 6792 13675 - 8 6052 13676 - 14 160 13677 - 14 1540 13678 - 10 1192 13679 - 19 9308 13680 - 22 2968 13681 - 9 8964 13682 - 15 1596 13683 - 21 6572 13685 - 23 2288 13686 - 6 1356 13687 - 18 3260 13689 - 12 1228 13691 - 6 3996 13693 - 13 6644 13694 - 11 2128 13857 - 13 9552 13859 - 10 2060 13861 - 10 8584 13862 - 14 5984 13863 - 11 8284 13864 - 7 3252 13867 - 18 7420 13868 - 17 4136 13869 - 5 7592 13870 + 10 6952 13665 + 22 4060 13667 + 6 3492 13668 + 18 5040 13669 + 15 7668 13670 + 18 3296 13671 + 14 9316 13673 + 12 8300 13674 + 12 6420 13675 + 8 5804 13676 + 13 9956 13677 + 14 1244 13678 + 10 832 13679 + 19 8936 13680 + 22 2664 13681 + 9 8644 13682 + 15 1312 13683 + 21 6316 13685 + 23 2112 13686 + 6 1176 13687 + 18 2900 13689 + 12 856 13691 + 6 3816 13693 + 13 6324 13694 + 11 1692 13857 + 13 9232 13859 + 10 1700 13861 + 10 8148 13862 + 14 5688 13863 + 11 7848 13864 + 7 3048 13867 + 18 7060 13868 + 17 3844 13869 + 5 7432 13870 24 1256 13871 - 8 9876 13874 - 20 232 13875 - 16 5528 13876 - 21 1388 13877 + 8 9628 13874 + 19 9876 13875 + 16 5328 13876 + 21 1132 13877 2 7100 13878 - 7 5004 13879 - 22 1832 13880 - 11 9620 13881 - 23 2416 13882 - 6 9952 13883 - 20 328 13884 - 8 728 13885 - 23 784 13886 - 12 7380 13887 - 12 8888 13888 - 5 2820 13889 - 8 7140 13891 - 21 6916 13892 - 9 900 13893 - 12 8380 13894 - 16 2456 13895 + 7 4800 13879 + 22 1528 13880 + 11 9184 13881 + 23 2240 13882 + 6 9772 13883 + 19 9972 13884 + 8 480 13885 + 23 280 13886 + 12 7008 13887 + 12 8516 13888 + 5 2660 13889 + 8 6892 13891 + 21 6660 13892 + 9 580 13893 + 12 8008 13894 + 16 2256 13895 24 1352 13896 - 12 788 13897 - 17 6860 13898 - 20 72 13899 - 16 1100 13900 - 9 4136 13904 - 6 2508 13905 - 17 1128 13906 - 10 8128 13908 - 12 8060 13911 + 12 416 13897 + 17 6568 13898 + 19 9716 13899 + 16 900 13900 + 9 3816 13904 + 6 2328 13905 + 17 836 13906 + 10 7692 13908 + 12 7688 13911 2 0 13912 - 9 9392 13914 - 14 1444 13915 + 9 9072 13914 + 14 1148 13915 4 8656 13917 - 11 6216 13919 - 8 1716 13920 - 13 7752 13921 - 7 4084 13922 - 20 40 13923 - 20 4572 13924 - 18 4228 13925 - 9 6972 13927 - 6 1708 13928 - 18 988 13929 - 7 8044 13932 - 11 3972 13934 - 9 1832 13937 - 17 1064 13938 + 11 5780 13919 + 8 1468 13920 + 13 7432 13921 + 7 3880 13922 + 19 9684 13923 + 20 4212 13924 + 18 3868 13925 + 9 6652 13927 + 6 1528 13928 + 18 628 13929 + 7 7840 13932 + 11 3536 13934 + 9 1512 13937 + 17 772 13938 5 32 13939 4 7884 13940 - 5 2756 13941 + 5 2596 13941 3 6032 13942 - 12 9856 13944 - 9 3568 13945 - 18 1020 13946 - 9 9720 13950 - 21 9520 14113 - 19 9920 14115 - 19 9276 14116 - 16 1652 14119 - 14 8408 14123 + 12 9484 13944 + 9 3248 13945 + 18 660 13946 + 9 9400 13950 + 21 9296 14113 + 19 9548 14115 + 19 8904 14116 + 16 1452 14119 + 14 8112 14123 2 6824 14124 - 9 2432 14126 - 5 8048 14127 + 9 2112 14126 + 5 7888 14127 2 8696 14128 - 12 2716 14129 - 8 600 14130 - 21 1228 14131 + 12 2344 14129 + 8 352 14130 + 21 972 14131 24 4824 14132 - 18 2772 14136 - 19 3388 14137 - 18 5084 14138 - 9 4352 14139 - 18 5464 14140 - 15 3388 14141 - 22 3780 14143 - 7 5680 14144 - 9 1928 14145 - 15 6752 14146 - 20 3976 14147 - 7 7772 14148 - 14 5032 14150 - 5 8016 14151 + 18 2412 14136 + 19 3016 14137 + 18 4724 14138 + 9 4032 14139 + 18 5104 14140 + 15 3104 14141 + 22 3476 14143 + 7 5476 14144 + 9 1608 14145 + 15 6468 14146 + 20 3616 14147 + 7 7568 14148 + 14 4736 14150 + 5 7856 14151 24 4632 14152 - 14 7328 14153 - 22 1736 14154 - 22 7420 14155 - 16 2360 14156 + 14 7032 14153 + 22 1432 14154 + 22 7116 14155 + 16 2160 14156 3 9264 14159 - 7 3956 14160 - 8 5772 14161 + 7 3752 14160 + 8 5524 14161 2 9608 14164 - 6 5836 14166 - 15 1008 14167 - 9 96 14169 - 16 5496 14170 - 15 7740 14172 - 11 6860 14173 - 15 5700 14174 - 8 9068 14175 + 6 5656 14166 + 15 724 14167 + 8 9852 14169 + 16 5296 14170 + 15 7456 14172 + 11 6424 14173 + 15 5416 14174 + 8 8820 14175 4 5912 14176 - 7 2668 14178 + 7 2464 14178 4 6472 14179 - 22 888 14182 - 19 8488 14183 - 8 7268 14184 + 22 584 14182 + 19 8116 14183 + 8 7020 14184 3 32 14185 - 13 1544 14186 - 22 9984 14187 - 9 8696 14188 + 13 1256 14186 + 22 9680 14187 + 9 8376 14188 3 9404 14190 - 17 5632 14191 + 17 5340 14191 4 3388 14192 - 22 3748 14194 + 22 3444 14194 4 248 14195 3 5428 14196 - 20 6288 14197 - 10 5924 14199 - 19 3420 14200 - 14 1680 14201 - 12 1664 14202 - 7 3616 14203 + 20 5928 14197 + 10 5488 14199 + 19 3048 14200 + 14 1384 14201 + 12 1292 14202 + 7 3412 14203 24 5284 14204 - 12 6824 14369 + 12 6452 14369 24 3780 14370 - 16 1812 14372 - 12 500 14373 - 8 376 14374 - 11 7640 14376 - 17 1304 14377 - 21 784 14378 - 21 7868 14379 - 18 700 14380 - 10 7744 14381 + 16 1612 14372 + 12 128 14373 + 8 128 14374 + 11 7204 14376 + 17 1012 14377 + 21 528 14378 + 21 7612 14379 + 18 340 14380 + 10 7308 14381 3 9072 14382 - 22 2196 14383 - 5 9724 14385 - 6 5772 14386 - 5 9320 14387 - 15 588 14389 - 7 1536 14390 - 20 6320 14391 - 13 224 14392 - 20 4292 14393 - 23 2800 14394 + 22 1892 14383 + 5 9564 14385 + 6 5592 14386 + 5 9160 14387 + 15 304 14389 + 7 1332 14390 + 20 5960 14391 + 12 9944 14392 + 20 3932 14393 + 23 2624 14394 2 396 14395 - 10 3768 14396 - 18 7868 14397 - 6 9688 14400 - 23 2160 14402 - 12 7112 14403 + 10 3408 14396 + 18 7508 14397 + 6 9508 14400 + 23 1984 14402 + 12 6740 14403 4 960 14404 - 20 9208 14405 - 9 2764 14406 - 16 6716 14407 - 9 1992 14409 - 6 6688 14410 - 12 5788 14411 - 10 4544 14412 - 18 9472 14413 - 16 2712 14414 - 17 6260 14415 + 20 8848 14405 + 9 2444 14406 + 16 6516 14407 + 9 1672 14409 + 6 6508 14410 + 12 5416 14411 + 10 4184 14412 + 18 9112 14413 + 16 2512 14414 + 17 5968 14415 4 896 14416 - 22 7036 14417 - 9 1508 14421 - 21 752 14423 - 13 7656 14424 + 22 6732 14417 + 9 1188 14421 + 21 496 14423 + 13 7336 14424 24 6268 14427 - 5 2916 14428 + 5 2756 14428 4 8688 14429 4 1024 14430 - 17 7812 14431 - 5 5856 14433 + 17 7520 14431 + 5 5696 14433 2 2208 14434 - 8 664 14435 - 21 720 14436 + 8 416 14435 + 21 464 14436 24 4856 14437 - 13 1480 14438 + 13 1192 14438 5 160 14439 - 6 5964 14443 - 12 532 14444 - 17 7080 14445 + 6 5784 14443 + 12 160 14444 + 17 6788 14445 4 9988 14446 - 22 7912 14448 - 15 2108 14450 - 10 9724 14452 - 18 8508 14453 - 7 9408 14455 - 10 1416 14456 - 15 880 14457 - 19 4732 14458 - 16 9752 14460 - 16 1516 14461 - 21 5916 14462 - 9 5100 14625 - 20 6224 14627 - 22 1672 14629 - 20 4412 14630 - 18 3592 14631 - 7 9908 14633 + 22 7608 14448 + 15 1824 14450 + 10 9288 14452 + 18 8148 14453 + 7 9172 14455 + 10 1056 14456 + 15 596 14457 + 19 4360 14458 + 16 9552 14460 + 16 1316 14461 + 21 5660 14462 + 9 4780 14625 + 20 5864 14627 + 22 1368 14629 + 20 4052 14630 + 18 3232 14631 + 7 9672 14633 3 8644 14634 - 18 2740 14635 - 5 1860 14636 - 5 6888 14637 - 9 3696 14639 - 13 8092 14641 - 9 3504 14642 + 18 2380 14635 + 5 1700 14636 + 5 6728 14637 + 9 3376 14639 + 13 7772 14641 + 9 3184 14642 4 3292 14643 - 14 5128 14644 - 16 2264 14645 - 13 6548 14646 + 14 4832 14644 + 16 2064 14645 + 13 6228 14646 24 1448 14649 - 11 6988 14651 + 11 6552 14651 24 3264 14653 4 3612 14654 - 11 6828 14655 - 23 816 14657 - 16 6780 14658 - 18 1840 14659 - 9 6080 14660 - 7 3924 14661 - 12 7016 14662 - 20 9796 14664 - 5 7180 14666 - 7 7276 14667 - 22 9168 14668 - 15 3060 14669 - 12 6176 14670 - 8 4860 14673 - 20 5600 14674 - 21 3708 14675 - 18 6096 14676 - 17 7112 14677 + 11 6392 14655 + 23 312 14657 + 16 6580 14658 + 18 1480 14659 + 9 5760 14660 + 7 3720 14661 + 12 6644 14662 + 20 9436 14664 + 5 7020 14666 + 7 7072 14667 + 22 8864 14668 + 15 2776 14669 + 12 5804 14670 + 8 4612 14673 + 20 5240 14674 + 21 3452 14675 + 18 5736 14676 + 17 6820 14677 24 4492 14678 - 12 3932 14679 + 12 3560 14679 2 5900 14680 - 21 6476 14681 + 21 6220 14681 4 2612 14682 - 22 3480 14683 + 22 3176 14683 4 1424 14685 - 20 7932 14687 - 11 6408 14688 - 9 1864 14689 - 20 2588 14690 - 13 3964 14692 - 20 168 14694 - 13 5984 14695 - 8 5468 14697 - 23 9256 14699 - 20 1544 14702 - 18 3452 14703 - 19 6700 14704 - 17 5600 14705 - 20 7720 14706 - 21 3784 14707 - 7 1756 14709 - 14 5716 14710 - 10 7356 14712 - 16 4800 14714 - 12 3408 14715 - 19 8880 14716 - 8 568 14718 - 15 3880 14881 - 6 7540 14882 - 11 2224 14883 - 10 4352 14884 - 16 600 14886 - 15 1904 14887 - 23 9192 14888 - 18 4764 14889 - 10 5696 14890 - 23 2096 14891 - 19 6344 14892 - 10 8064 14894 - 5 8872 14896 + 20 7572 14687 + 11 5972 14688 + 9 1544 14689 + 20 2228 14690 + 13 3644 14692 + 19 9812 14694 + 13 5664 14695 + 8 5220 14697 + 23 9048 14699 + 20 1184 14702 + 18 3092 14703 + 19 6328 14704 + 17 5308 14705 + 20 7360 14706 + 21 3528 14707 + 7 1552 14709 + 14 5420 14710 + 10 6920 14712 + 16 4600 14714 + 12 3036 14715 + 19 8508 14716 + 8 320 14718 + 15 3596 14881 + 6 7360 14882 + 11 1788 14883 + 10 3992 14884 + 16 400 14886 + 15 1620 14887 + 23 8984 14888 + 18 4404 14889 + 10 5260 14890 + 23 1920 14891 + 19 5972 14892 + 10 7628 14894 + 5 8712 14896 4 2644 14897 - 14 4408 14898 - 9 5984 14899 - 23 8648 14900 - 13 700 14902 - 15 8960 14904 - 6 1580 14905 - 9 3908 14906 - 22 3512 14907 - 20 884 14909 - 9 1604 14910 + 14 4112 14898 + 9 5664 14899 + 23 8440 14900 + 13 412 14902 + 15 8676 14904 + 6 1400 14905 + 9 3588 14906 + 22 3208 14907 + 20 524 14909 + 9 1284 14910 2 4812 14911 - 22 9664 14914 - 20 3576 14916 + 22 9360 14914 + 20 3216 14916 2 3760 14917 24 5696 14918 - 20 6128 14919 - 21 1100 14922 - 9 2464 14923 - 7 6116 14924 - 21 4924 14925 - 22 336 14926 - 12 5820 14927 - 20 9892 14928 - 16 9880 14929 - 11 2852 14930 - 22 7556 14931 - 16 2680 14933 + 20 5768 14919 + 21 844 14922 + 9 2144 14923 + 7 5912 14924 + 21 4668 14925 + 22 32 14926 + 12 5448 14927 + 20 9532 14928 + 16 9680 14929 + 11 2416 14930 + 22 7252 14931 + 16 2480 14933 2 1520 14935 3 4376 14936 - 14 4376 14937 - 12 692 14938 - 17 7048 14939 + 14 4080 14937 + 12 320 14938 + 17 6756 14939 3 8976 14940 - 8 5676 14941 - 6 7508 14942 - 21 9552 14943 + 8 5428 14941 + 6 7328 14942 + 21 9328 14943 3 8504 14944 - 17 292 14945 + 17 0 14945 24 1996 14946 2 8556 14948 - 13 2576 14949 - 11 5688 14953 + 13 2256 14949 + 11 5252 14953 2 5932 14954 - 12 6632 14958 - 12 9312 14959 + 12 6260 14958 + 12 8940 14959 4 4848 14961 - 13 9616 14962 - 14 3232 14963 - 6 1612 14966 - 16 2156 14967 - 16 5088 14968 - 6 7960 14969 - 7 7340 14973 - 18 2708 14974 - 16 4864 15137 - 15 4992 15139 - 22 4332 15140 - 20 4324 15141 - 16 8372 15142 - 14 5192 15144 - 11 3400 15150 + 13 9296 14962 + 14 2936 14963 + 6 1432 14966 + 16 1956 14967 + 16 4888 14968 + 6 7780 14969 + 7 7136 14973 + 18 2348 14974 + 16 4664 15137 + 15 4708 15139 + 22 4028 15140 + 20 3964 15141 + 16 8172 15142 + 14 4896 15144 + 11 2964 15150 5 224 15152 - 15 556 15153 + 15 272 15153 2 3280 15154 - 22 5408 15155 - 20 6860 15156 - 18 7084 15158 - 23 9872 15159 - 8 5740 15162 - 9 2068 15163 - 15 0 15165 - 16 5120 15167 - 5 6704 15168 - 19 5920 15170 - 18 3388 15171 + 22 5104 15155 + 20 6500 15156 + 18 6724 15158 + 23 9664 15159 + 8 5492 15162 + 9 1748 15163 + 14 9920 15165 + 16 4920 15167 + 5 6544 15168 + 19 5548 15170 + 18 3028 15171 3 1148 15172 - 12 7080 15173 - 6 1900 15175 + 12 6708 15173 + 6 1720 15175 4 3044 15176 - 23 128 15177 - 11 8348 15178 + 22 9840 15177 + 11 7912 15178 3 8772 15179 - 12 6856 15180 - 17 9708 15181 - 20 7628 15182 - 12 3740 15183 + 12 6484 15180 + 17 9416 15181 + 20 7268 15182 + 12 3368 15183 24 1416 15184 - 9 6048 15185 - 18 196 15186 + 9 5728 15185 + 17 9904 15186 4 6600 15188 - 18 5304 15189 - 22 6652 15190 - 6 8404 15191 - 18 8156 15192 - 16 6248 15193 - 17 388 15196 - 6 8884 15197 + 18 4944 15189 + 22 6348 15190 + 6 8224 15191 + 18 7796 15192 + 16 6048 15193 + 17 96 15196 + 6 8704 15197 4 32 15198 - 12 2240 15199 - 5 7212 15200 - 15 9940 15201 - 12 6984 15203 - 10 1224 15204 - 7 6180 15205 - 20 7392 15206 - 22 3544 15207 - 14 5524 15208 - 12 2576 15209 + 12 1868 15199 + 5 7052 15200 + 15 9656 15201 + 12 6612 15203 + 10 864 15204 + 7 5976 15205 + 20 7032 15206 + 22 3240 15207 + 14 5228 15208 + 12 2204 15209 3 64 15210 - 13 3676 15211 + 13 3356 15211 3 9040 15212 - 7 5424 15213 - 10 2800 15214 - 5 1272 15215 - 19 7800 15216 - 5 3416 15217 - 23 8776 15218 - 17 3172 15219 - 17 4104 15220 - 5 9756 15221 - 14 6252 15222 - 13 8808 15223 - 15 3944 15224 + 7 5220 15213 + 10 2440 15214 + 5 1112 15215 + 19 7428 15216 + 5 3256 15217 + 23 8568 15218 + 17 2880 15219 + 17 3812 15220 + 5 9596 15221 + 14 5956 15222 + 13 8488 15223 + 15 3660 15224 4 7948 15225 - 12 7348 15226 - 18 8948 15227 - 19 9468 15228 + 12 6976 15226 + 18 8588 15227 + 19 9096 15228 3 8280 15229 - 16 9104 15230 - 12 3076 15393 - 18 8636 15394 - 7 9744 15395 - 10 2092 15396 - 13 3516 15397 - 19 7736 15398 - 13 1512 15399 - 8 2612 15400 - 5 5228 15401 - 11 544 15402 + 16 8904 15230 + 12 2704 15393 + 18 8276 15394 + 7 9508 15395 + 10 1732 15396 + 13 3196 15397 + 19 7364 15398 + 13 1224 15399 + 8 2364 15400 + 5 5068 15401 + 11 108 15402 4 6792 15403 - 22 4692 15405 - 11 6924 15407 - 9 6604 15408 - 5 3384 15409 - 11 1196 15412 + 22 4388 15405 + 11 6488 15407 + 9 6284 15408 + 5 3224 15409 + 11 760 15412 24 2616 15415 - 17 3640 15417 + 17 3348 15417 3 7416 15418 3 5968 15420 - 20 9144 15422 - 9 3276 15423 - 12 596 15424 - 23 912 15425 + 20 8784 15422 + 9 2956 15423 + 12 224 15424 + 23 408 15425 3 9104 15426 - 10 8324 15431 - 22 528 15435 - 17 5256 15436 - 17 8672 15437 - 9 4104 15438 - 17 2576 15439 - 12 3836 15440 - 13 6060 15441 - 5 9564 15442 - 20 948 15444 + 10 7888 15431 + 22 224 15435 + 17 4964 15436 + 17 8380 15437 + 9 3784 15438 + 17 2284 15439 + 12 3464 15440 + 13 5740 15441 + 5 9404 15442 + 20 588 15444 2 2568 15445 - 19 436 15446 - 10 8096 15447 - 18 9344 15448 - 7 3028 15449 - 15 2000 15450 - 11 960 15451 - 12 7444 15452 - 12 2672 15455 - 22 920 15456 - 14 2296 15457 + 19 64 15446 + 10 7660 15447 + 18 8984 15448 + 7 2824 15449 + 15 1716 15450 + 11 524 15451 + 12 7072 15452 + 12 2300 15455 + 22 616 15456 + 14 2000 15457 4 3548 15459 - 8 2580 15460 + 8 2332 15460 3 4988 15461 2 2144 15463 - 22 6092 15464 + 22 5788 15464 3 1776 15465 - 8 6084 15466 + 8 5836 15466 4 4528 15467 - 17 4168 15468 - 6 3004 15469 - 6 6092 15470 + 17 3876 15468 + 6 2824 15469 + 6 5912 15470 2 3728 15471 - 16 8180 15473 - 18 8028 15474 - 5 3492 15475 - 19 2372 15476 - 9 3308 15477 - 9 9040 15479 - 18 8540 15480 - 20 7488 15481 - 22 3716 15483 - 20 5632 15484 - 9 2336 15485 - 13 1812 15486 - 12 6568 15649 - 15 1188 15650 - 15 8168 15651 - 18 2000 15652 - 11 6248 15653 - 14 9676 15654 - 20 7900 15656 - 10 1288 15657 - 19 2404 15658 - 19 5952 15660 - 10 5228 15661 - 15 4656 15662 - 8 5360 15664 - 23 9312 15665 - 20 2028 15667 + 16 7980 15473 + 18 7668 15474 + 5 3332 15475 + 19 2000 15476 + 9 2988 15477 + 9 8720 15479 + 18 8180 15480 + 20 7128 15481 + 22 3412 15483 + 20 5272 15484 + 9 2016 15485 + 13 1492 15486 + 12 6196 15649 + 15 904 15650 + 15 7884 15651 + 18 1640 15652 + 11 5812 15653 + 14 9380 15654 + 20 7540 15656 + 10 928 15657 + 19 2032 15658 + 19 5580 15660 + 10 4792 15661 + 15 4372 15662 + 8 5112 15664 + 23 9104 15665 + 20 1668 15667 2 3216 15669 - 16 4992 15670 - 17 8368 15671 - 14 8804 15672 + 16 4792 15670 + 17 8076 15671 + 14 8508 15672 3 2348 15673 4 2048 15675 - 22 5376 15676 - 5 4436 15677 + 22 5072 15676 + 5 4276 15677 5 96 15678 - 11 3132 15679 - 6 1516 15680 - 15 6784 15681 - 8 932 15682 - 6 1964 15683 + 11 2696 15679 + 6 1336 15680 + 15 6500 15681 + 8 684 15682 + 6 1784 15683 3 8676 15684 2 9672 15685 24 6588 15686 4 8140 15687 - 20 4948 15689 - 23 192 15690 + 20 4588 15689 + 22 9904 15690 4 3220 15691 - 17 4072 15692 - 17 7176 15693 - 13 3708 15694 - 8 184 15695 + 17 3780 15692 + 17 6884 15693 + 13 3388 15694 + 7 9948 15695 4 4052 15696 2 2112 15697 - 16 7100 15698 - 19 7508 15699 - 23 6028 15701 - 21 4796 15702 - 9 8996 15704 + 16 6900 15698 + 19 7136 15699 + 23 5852 15701 + 21 4540 15702 + 9 8676 15704 4 8012 15706 2 9008 15707 - 17 4296 15708 - 9 128 15710 + 17 4004 15708 + 8 9884 15710 2 3440 15712 - 23 848 15713 + 23 344 15713 2 3376 15714 - 6 1388 15715 - 5 6672 15716 - 5 4692 15717 - 10 6764 15719 - 8 4796 15720 - 23 6684 15721 - 13 5012 15722 - 23 2352 15723 - 18 9824 15724 - 14 9804 15726 + 6 1208 15715 + 5 6512 15716 + 5 4532 15717 + 10 6328 15719 + 8 4548 15720 + 23 6508 15721 + 13 4692 15722 + 23 2176 15723 + 18 9464 15724 + 14 9508 15726 24 1384 15727 - 13 6484 15728 - 9 2572 15729 - 17 5032 15732 - 8 1428 15733 - 12 8092 15734 - 16 4184 15735 - 15 2964 15736 - 16 4152 15737 - 16 568 15738 - 12 1036 15740 + 13 6164 15728 + 9 2252 15729 + 17 4740 15732 + 8 1180 15733 + 12 7720 15734 + 16 3984 15735 + 15 2680 15736 + 16 3952 15737 + 16 368 15738 + 12 664 15740 3 8612 15741 - 17 8020 15742 - 17 8608 15905 - 5 9692 15906 - 10 9400 15907 - 9 4168 15908 - 21 4764 15910 - 13 7784 15911 + 17 7728 15742 + 17 8316 15905 + 5 9532 15906 + 10 8964 15907 + 9 3848 15908 + 21 4508 15910 + 13 7464 15911 24 4792 15913 - 13 1124 15914 - 19 1740 15915 - 20 9828 15916 - 15 5024 15917 - 19 2500 15918 - 23 8712 15919 - 12 2544 15920 - 21 6748 15921 - 19 5824 15922 - 12 5124 15924 - 12 6208 15925 - 6 7928 15926 + 13 836 15914 + 19 1368 15915 + 20 9468 15916 + 15 4740 15917 + 19 2128 15918 + 23 8504 15919 + 12 2172 15920 + 21 6492 15921 + 19 5452 15922 + 12 4752 15924 + 12 5836 15925 + 6 7748 15926 2 5608 15927 - 20 1404 15928 - 15 7708 15930 - 5 9224 15931 - 19 2664 15932 - 5 3448 15933 - 23 2320 15934 - 20 9700 15938 - 21 8408 15939 - 21 1356 15940 - 17 5096 15942 - 16 2124 15943 - 13 8712 15944 + 20 1044 15928 + 15 7424 15930 + 5 9064 15931 + 19 2292 15932 + 5 3288 15933 + 23 2144 15934 + 20 9340 15938 + 21 8152 15939 + 21 1100 15940 + 17 4804 15942 + 16 1924 15943 + 13 8392 15944 4 6008 15945 - 18 7388 15946 - 11 404 15947 - 17 5064 15948 + 18 7028 15946 + 10 9968 15947 + 17 4772 15948 3 2316 15949 - 15 8420 15950 - 21 288 15951 - 14 4568 15952 + 15 8136 15950 + 21 32 15951 + 14 4272 15952 24 6396 15953 - 9 1960 15954 - 20 4508 15955 - 21 2044 15959 - 23 4872 15961 - 21 320 15962 - 15 5764 15963 - 18 8604 15964 - 20 2984 15965 - 7 3476 15966 + 9 1640 15954 + 20 4148 15955 + 21 1788 15959 + 23 4696 15961 + 21 64 15962 + 15 5480 15963 + 18 8244 15964 + 20 2624 15965 + 7 3272 15966 2 6552 15967 - 9 5440 15970 - 19 5356 15971 - 8 8772 15973 + 9 5120 15970 + 19 4984 15971 + 8 8524 15973 24 5348 15974 - 23 9904 15976 - 15 5464 15977 - 12 6696 15978 - 22 4960 15979 - 12 1696 15980 - 23 880 15981 + 23 9696 15976 + 15 5180 15977 + 12 6324 15978 + 22 4656 15979 + 12 1324 15980 + 23 376 15981 2 1424 15982 - 16 8308 15983 - 5 5760 15984 - 19 8004 15986 + 16 8108 15983 + 5 5600 15984 + 19 7632 15986 2 8824 15988 - 8 792 15989 + 8 544 15989 2 3992 15990 - 13 5856 15992 + 13 5536 15992 2 5480 15993 - 8 5296 15994 - 17 0 15995 - 11 7868 15996 - 22 6748 15998 + 8 5048 15994 + 16 9908 15995 + 11 7432 15996 + 22 6444 15998 3 9168 16162 - 22 7004 16163 - 16 5056 16165 - 11 2468 16166 - 13 2672 16167 - 9 2132 16168 - 17 4328 16169 - 14 2700 16171 - 17 1032 16173 - 19 6980 16174 - 7 2700 16175 - 6 3920 16176 + 22 6700 16163 + 16 4856 16165 + 11 2032 16166 + 13 2352 16167 + 9 1812 16168 + 17 4036 16169 + 14 2404 16171 + 17 740 16173 + 19 6608 16174 + 7 2496 16175 + 6 3740 16176 24 5516 16177 - 20 6480 16178 + 20 6120 16178 5 460 16179 - 19 4828 16180 + 19 4424 16180 2 8728 16181 - 12 6664 16182 + 12 6292 16182 2 4380 16183 - 10 8648 16185 + 10 8212 16185 24 6844 16187 - 19 2100 16188 - 21 9488 16189 - 5 5792 16190 - 20 2072 16191 - 16 2584 16192 - 22 1800 16194 - 11 4896 16195 - 9 8332 16197 - 9 0 16198 - 21 4668 16199 - 18 4796 16200 + 19 1728 16188 + 21 9264 16189 + 5 5632 16190 + 20 1712 16191 + 16 2384 16192 + 22 1496 16194 + 11 4460 16195 + 9 8012 16197 + 8 9756 16198 + 21 4412 16199 + 18 4436 16200 4 2408 16201 - 9 2164 16202 - 5 1304 16203 - 20 7424 16204 - 18 9044 16205 - 20 6192 16206 - 16 1352 16207 - 7 1292 16210 - 14 7736 16211 - 22 9760 16212 - 12 8124 16215 - 8 1868 16216 - 16 9816 16221 - 9 7416 16222 - 21 5104 16225 + 9 1844 16202 + 5 1144 16203 + 20 7064 16204 + 18 8684 16205 + 20 5832 16206 + 16 1152 16207 + 7 1088 16210 + 14 7440 16211 + 22 9456 16212 + 12 7752 16215 + 8 1620 16216 + 16 9616 16221 + 9 7096 16222 + 21 4848 16225 24 548 16226 3 5352 16227 - 6 8436 16228 - 5 7656 16229 + 6 8256 16228 + 5 7496 16229 2 1456 16230 - 10 9368 16231 - 8 9164 16232 - 17 2428 16233 - 19 8036 16234 - 12 5608 16235 - 8 4828 16236 - 21 2888 16238 - 16 8340 16239 - 22 7484 16241 - 6 6220 16242 - 10 524 16243 - 8 1364 16244 - 13 1448 16245 + 10 8932 16231 + 8 8916 16232 + 17 2136 16233 + 19 7664 16234 + 12 5236 16235 + 8 4580 16236 + 21 2632 16238 + 16 8140 16239 + 22 7180 16241 + 6 6040 16242 + 10 164 16243 + 8 1116 16244 + 13 1160 16245 24 1044 16248 - 20 6416 16249 - 17 7956 16417 - 19 9984 16418 - 6 9088 16419 - 11 9020 16420 - 17 324 16421 - 16 9264 16422 + 20 6056 16249 + 17 7664 16417 + 19 9612 16418 + 6 8908 16419 + 11 8584 16420 + 17 32 16421 + 16 9064 16422 4 9148 16423 - 19 7044 16425 - 14 0 16426 - 16 1320 16427 - 23 4840 16428 - 20 8428 16429 - 6 4912 16430 - 8 1396 16431 - 7 3672 16432 - 17 4264 16433 - 6 2972 16434 + 19 6672 16425 + 13 9796 16426 + 16 1120 16427 + 23 4664 16428 + 20 8068 16429 + 6 4732 16430 + 8 1148 16431 + 7 3468 16432 + 17 3972 16433 + 6 2792 16434 2 2272 16437 - 17 1096 16438 - 10 9756 16439 - 16 3824 16440 - 23 7216 16441 - 6 4040 16442 - 10 3992 16443 - 13 9712 16444 - 13 5920 16445 - 6 180 16446 + 17 804 16438 + 10 9320 16439 + 16 3624 16440 + 23 7008 16441 + 6 3860 16442 + 10 3632 16443 + 13 9392 16444 + 13 5600 16445 + 6 0 16446 24 4664 16447 3 8344 16448 - 11 6376 16449 - 22 6844 16450 - 9 7700 16452 - 19 868 16453 - 7 5068 16454 + 11 5940 16449 + 22 6540 16450 + 9 7380 16452 + 19 496 16453 + 7 4864 16454 4 4784 16455 - 5 1496 16457 - 20 9240 16458 - 14 5064 16459 - 6 9332 16461 - 15 3028 16462 - 9 8364 16463 - 22 4992 16464 - 12 7048 16465 + 5 1336 16457 + 20 8880 16458 + 14 4768 16459 + 6 9152 16461 + 15 2744 16462 + 9 8044 16463 + 22 4688 16464 + 12 6676 16465 3 8740 16466 - 6 9012 16467 - 5 6188 16469 - 21 1484 16470 - 20 852 16471 - 6 3480 16474 - 23 9840 16475 - 20 5968 16476 - 19 4076 16477 - 20 4668 16478 - 5 6156 16479 - 8 9196 16480 - 17 4232 16481 - 8 7076 16482 - 8 9908 16483 + 6 8832 16467 + 5 6028 16469 + 21 1228 16470 + 20 492 16471 + 6 3300 16474 + 23 9632 16475 + 20 5608 16476 + 19 3704 16477 + 20 4308 16478 + 5 5996 16479 + 8 8948 16480 + 17 3940 16481 + 8 6828 16482 + 8 9660 16483 24 1708 16484 4 4880 16485 - 17 9336 16487 - 22 6124 16488 - 18 3292 16489 - 18 7996 16490 - 12 3804 16491 - 10 3928 16492 - 6 3168 16494 - 9 320 16495 - 17 6292 16496 - 18 4068 16498 - 8 7204 16500 - 13 9904 16501 - 18 7964 16502 - 22 432 16503 - 8 1836 16504 - 11 9432 16505 - 9 2604 16506 - 18 796 16507 - 8 9940 16510 - 18 9856 16673 + 17 9044 16487 + 22 5820 16488 + 18 2932 16489 + 18 7636 16490 + 12 3432 16491 + 10 3568 16492 + 6 2988 16494 + 9 0 16495 + 17 6000 16496 + 18 3708 16498 + 8 6956 16500 + 13 9584 16501 + 18 7604 16502 + 22 128 16503 + 8 1588 16504 + 11 8996 16505 + 9 2284 16506 + 18 436 16507 + 8 9692 16510 + 18 9496 16673 4 6696 16674 - 9 6668 16676 - 8 4732 16677 - 11 372 16678 - 19 6280 16681 - 17 8400 16682 - 16 6972 16683 - 10 7936 16684 + 9 6348 16676 + 8 4484 16677 + 10 9936 16678 + 19 5908 16681 + 17 8108 16682 + 16 6772 16683 + 10 7500 16684 24 96 16685 - 23 8680 16687 - 8 1492 16688 + 23 8472 16687 + 8 1244 16688 24 6428 16689 - 6 7088 16690 + 6 6908 16690 24 3168 16691 - 17 9548 16692 - 20 3672 16693 - 5 8776 16694 - 20 8396 16698 - 9 1348 16700 - 11 3324 16702 - 7 520 16703 - 20 6160 16706 + 17 9256 16692 + 20 3312 16693 + 5 8616 16694 + 20 8036 16698 + 9 1028 16700 + 11 2888 16702 + 7 316 16703 + 20 5800 16706 2 4844 16707 - 7 3520 16708 - 11 5784 16709 - 23 1232 16710 - 17 6828 16711 + 7 3316 16708 + 11 5348 16709 + 23 728 16710 + 17 6536 16711 3 9008 16712 - 16 2424 16714 - 20 8920 16715 - 21 6444 16718 + 16 2224 16714 + 20 8560 16715 + 21 6188 16718 4 4248 16719 - 20 7020 16720 - 17 4040 16722 - 17 2608 16723 - 12 1068 16724 - 15 1968 16725 - 12 2608 16728 + 20 6660 16720 + 17 3748 16722 + 17 2316 16723 + 12 696 16724 + 15 1684 16725 + 12 2236 16728 4 7028 16731 - 9 2240 16732 + 9 1920 16732 24 5220 16733 - 7 8452 16734 - 11 3560 16736 + 7 8248 16734 + 11 3124 16736 24 4068 16737 - 8 1092 16738 - 11 6344 16739 - 18 9920 16741 - 23 8744 16743 - 16 232 16744 - 9 9816 16746 - 12 9280 16747 + 8 844 16738 + 11 5908 16739 + 18 9560 16741 + 23 8536 16743 + 16 32 16744 + 9 9496 16746 + 12 8908 16747 24 1784 16749 2 1488 16752 - 19 5856 16753 - 6 6156 16754 - 6 5676 16756 + 19 5484 16753 + 6 5976 16754 + 6 5496 16756 4 6760 16757 - 14 6016 16758 - 11 5752 16759 - 6 6060 16760 - 15 7360 16762 + 14 5720 16758 + 11 5316 16759 + 6 5880 16760 + 15 7076 16762 2 4036 16763 - 10 9852 16764 - 17 9936 16765 - 13 5236 16766 - 7 6588 16929 - 22 8348 16930 + 10 9416 16764 + 17 9644 16765 + 13 4916 16766 + 7 6384 16929 + 22 8044 16930 24 3984 16931 - 11 4308 16932 - 18 8572 16933 - 8 1620 16934 - 14 9060 16935 + 11 3872 16932 + 18 8212 16933 + 8 1372 16934 + 14 8764 16935 4 8268 16936 - 12 3964 16937 - 17 7628 16938 + 12 3592 16937 + 17 7336 16938 3 3684 16939 - 19 4592 16940 - 13 2984 16941 - 16 6184 16942 - 8 1556 16943 - 13 8744 16944 - 18 828 16945 + 19 4220 16940 + 13 2664 16941 + 16 5984 16942 + 8 1308 16943 + 13 8424 16944 + 18 468 16945 24 6652 16946 - 7 860 16947 - 5 3244 16948 - 11 7608 16950 - 19 7412 16952 - 16 2488 16953 - 14 5920 16954 + 7 656 16947 + 5 3084 16948 + 11 7172 16950 + 19 7040 16952 + 16 2288 16953 + 14 5624 16954 24 6460 16955 - 11 3940 16956 + 11 3504 16956 2 8664 16958 - 21 2396 16959 - 16 8244 16960 - 14 5856 16961 - 20 1448 16964 - 12 5092 16965 - 9 2272 16966 - 7 5744 16967 - 20 1244 16972 - 21 4268 16974 - 7 5036 16976 - 15 9508 16977 + 21 2140 16959 + 16 8044 16960 + 14 5560 16961 + 20 1088 16964 + 12 4720 16965 + 9 1952 16966 + 7 5540 16967 + 20 884 16972 + 21 4012 16974 + 7 4832 16976 + 15 9224 16977 24 1320 16979 - 23 5164 16980 - 12 3268 16981 - 13 1384 16982 - 5 3352 16984 - 5 9288 16985 - 21 3088 16986 - 15 9476 16987 - 6 5708 16990 - 15 4560 16991 - 22 9728 16992 - 22 6716 16993 - 17 7564 16994 - 19 7908 16997 - 5 1464 16998 - 14 4664 16999 - 17 4008 17000 - 14 1744 17002 - 22 9824 17003 + 23 4988 16980 + 12 2896 16981 + 13 1096 16982 + 5 3192 16984 + 5 9128 16985 + 21 2832 16986 + 15 9192 16987 + 6 5528 16990 + 15 4276 16991 + 22 9424 16992 + 22 6412 16993 + 17 7272 16994 + 19 7536 16997 + 5 1304 16998 + 14 4368 16999 + 17 3716 17000 + 14 1448 17002 + 22 9520 17003 4 8204 17004 - 16 6024 17006 - 15 6136 17008 - 14 2764 17010 - 14 5556 17011 - 19 6376 17012 - 22 2512 17013 - 20 9764 17015 - 6 7444 17017 - 12 8780 17018 - 16 632 17186 - 9 8664 17187 - 8 3932 17188 - 8 3548 17189 - 12 3236 17190 - 15 976 17191 - 17 356 17194 - 7 8920 17195 + 16 5824 17006 + 15 5852 17008 + 14 2468 17010 + 14 5260 17011 + 19 6004 17012 + 22 2208 17013 + 20 9404 17015 + 6 7264 17017 + 12 8408 17018 + 16 432 17186 + 9 8344 17187 + 8 3684 17188 + 8 3300 17189 + 12 2864 17190 + 15 692 17191 + 17 64 17194 + 7 8716 17195 24 516 17199 - 18 7200 17200 - 19 6408 17201 - 20 3812 17202 - 7 8888 17204 - 14 9740 17205 - 5 2660 17206 - 15 4528 17208 - 19 1240 17210 - 11 5656 17211 - 16 6152 17212 - 14 7640 17216 - 15 8136 17218 + 18 6840 17200 + 19 6036 17201 + 20 3452 17202 + 7 8684 17204 + 14 9444 17205 + 5 2500 17206 + 15 4244 17208 + 19 868 17210 + 11 5220 17211 + 16 5952 17212 + 14 7344 17216 + 15 7852 17218 3 6336 17219 - 18 9888 17220 - 21 7012 17221 - 12 8348 17222 - 15 6072 17223 - 23 96 17224 + 18 9528 17220 + 21 6756 17221 + 12 7976 17222 + 15 5788 17223 + 22 9808 17224 24 6748 17226 4 2016 17227 - 11 3812 17228 + 11 3376 17228 3 1916 17229 - 9 3728 17230 + 9 3408 17230 4 3012 17231 - 20 4884 17233 - 15 1380 17235 - 5 3320 17236 - 20 5708 17237 - 22 4268 17238 + 20 4524 17233 + 15 1096 17235 + 5 3160 17236 + 20 5348 17237 + 22 3964 17238 3 7852 17239 - 10 8552 17241 + 10 8116 17241 4 6536 17243 - 7 892 17244 - 9 2796 17245 - 6 9236 17246 - 21 6948 17247 - 14 1476 17248 + 7 688 17244 + 9 2476 17245 + 6 9056 17246 + 21 6692 17247 + 14 1180 17248 2 3664 17249 - 18 9376 17250 - 16 6088 17251 - 16 9200 17252 - 5 9128 17253 - 20 3844 17254 - 19 6472 17255 - 19 372 17256 - 15 3092 17257 - 5 5600 17258 + 18 9016 17250 + 16 5888 17251 + 16 9000 17252 + 5 8968 17253 + 20 3484 17254 + 19 6100 17255 + 19 0 17256 + 15 2808 17257 + 5 5440 17258 3 5904 17259 - 14 6744 17260 - 16 5960 17261 - 7 0 17262 - 17 4740 17263 - 20 4980 17266 - 17 4200 17267 - 15 1348 17272 - 23 2768 17273 + 14 6448 17260 + 16 5760 17261 + 6 9836 17262 + 17 4448 17263 + 20 4620 17266 + 17 3908 17267 + 15 1064 17272 + 23 2592 17273 2 6616 17274 - 18 3720 17275 - 12 756 17278 - 8 7236 17442 - 8 6616 17443 - 8 3592 17444 - 9 2368 17445 + 18 3360 17275 + 12 384 17278 + 8 6988 17442 + 8 6368 17443 + 8 3344 17444 + 9 2048 17445 24 6908 17446 - 15 9572 17447 - 8 1124 17448 - 18 4164 17449 - 15 944 17451 + 15 9288 17447 + 8 876 17448 + 18 3804 17449 + 15 660 17451 4 7916 17452 - 6 7056 17454 - 17 3608 17455 - 9 1572 17456 - 15 4592 17457 - 9 4288 17458 + 6 6876 17454 + 17 3316 17455 + 9 1252 17456 + 15 4308 17457 + 9 3968 17458 3 6368 17460 - 12 724 17462 - 12 9496 17463 - 6 7152 17465 - 19 2696 17466 + 12 352 17462 + 12 9124 17463 + 6 6972 17465 + 19 2324 17466 4 5404 17467 - 23 3940 17468 - 21 4236 17470 - 18 6000 17471 - 22 9200 17472 + 23 3764 17468 + 21 3980 17470 + 18 5640 17471 + 22 8896 17472 3 3172 17473 - 20 4008 17474 - 20 1480 17475 - 9 9148 17476 - 9 64 17477 - 11 1476 17478 - 6 6624 17481 - 22 6060 17483 - 11 1828 17484 - 7 6492 17485 - 10 9820 17490 - 22 4204 17492 - 9 7480 17498 - 14 6776 17502 - 23 4368 17503 - 16 8436 17504 + 20 3648 17474 + 20 1120 17475 + 9 8828 17476 + 8 9820 17477 + 11 1040 17478 + 6 6444 17481 + 22 5756 17483 + 11 1392 17484 + 7 6288 17485 + 10 9384 17490 + 22 3900 17492 + 9 7160 17498 + 14 6480 17502 + 23 4192 17503 + 16 8236 17504 2 8952 17506 - 12 3108 17507 - 14 7672 17508 - 15 5732 17509 - 8 5328 17511 - 22 9696 17512 - 14 5684 17513 - 22 604 17514 - 12 2640 17515 - 13 3996 17516 - 16 2092 17517 - 18 1552 17518 - 11 4068 17519 - 22 3640 17521 - 18 2600 17523 - 22 4652 17528 - 16 6812 17529 - 13 1908 17530 - 23 32 17531 - 21 2524 17534 - 22 9792 17697 - 20 6924 17701 - 5 1240 17702 - 9 4720 17704 - 6 1804 17705 - 21 2856 17706 - 8 8344 17707 - 12 9824 17708 - 8 5708 17711 - 14 7232 17712 + 12 2736 17507 + 14 7376 17508 + 15 5448 17509 + 8 5080 17511 + 22 9392 17512 + 14 5388 17513 + 22 300 17514 + 12 2268 17515 + 13 3676 17516 + 16 1892 17517 + 18 1192 17518 + 11 3632 17519 + 22 3336 17521 + 18 2240 17523 + 22 4348 17528 + 16 6612 17529 + 13 1588 17530 + 22 9744 17531 + 21 2268 17534 + 22 9488 17697 + 20 6564 17701 + 5 1080 17702 + 9 4400 17704 + 6 1624 17705 + 21 2600 17706 + 8 8096 17707 + 12 9452 17708 + 8 5460 17711 + 14 6936 17712 24 6492 17713 - 20 1276 17715 - 17 9676 17716 - 16 5560 17717 - 5 6952 17719 - 20 4916 17720 - 11 9464 17721 - 11 928 17722 - 8 280 17726 - 6 2220 17728 - 9 3664 17729 - 22 1768 17730 - 9 160 17732 - 14 1508 17733 - 7 8076 17734 - 8 248 17735 - 5 9064 17737 - 15 4356 17738 - 18 3356 17740 - 21 384 17741 + 20 916 17715 + 17 9384 17716 + 16 5360 17717 + 5 6792 17719 + 20 4556 17720 + 11 9028 17721 + 11 492 17722 + 8 32 17726 + 6 2040 17728 + 9 3344 17729 + 22 1464 17730 + 8 9916 17732 + 14 1212 17733 + 7 7872 17734 + 8 0 17735 + 5 8904 17737 + 15 4072 17738 + 18 2996 17740 + 21 128 17741 3 8012 17743 - 19 4108 17744 - 6 8468 17746 - 6 1452 17747 - 23 4904 17748 - 14 3548 17752 - 11 8316 17753 - 13 7160 17754 - 19 7768 17755 - 13 8060 17756 - 8 9228 17757 - 21 6508 17758 - 8 4220 17759 - 13 7128 17760 - 6 5240 17761 - 17 5128 17762 - 16 2648 17763 - 16 2552 17767 + 19 3736 17744 + 6 8288 17746 + 6 1272 17747 + 23 4728 17748 + 14 3252 17752 + 11 7880 17753 + 13 6840 17754 + 19 7396 17755 + 13 7740 17756 + 8 8980 17757 + 21 6252 17758 + 8 3972 17759 + 13 6808 17760 + 6 5060 17761 + 17 4836 17762 + 16 2448 17763 + 21 8636 17766 + 16 2352 17767 4 1392 17769 - 11 5880 17770 + 11 5444 17770 2 5996 17771 - 15 2380 17772 + 15 2096 17772 4 7484 17773 4 864 17775 - 20 8492 17776 - 22 2480 17778 - 13 256 17779 - 20 6892 17780 - 16 1780 17782 - 7 3156 17783 + 20 8132 17776 + 22 2176 17778 + 12 9976 17779 + 20 6532 17780 + 16 1580 17782 + 7 2952 17783 4 7516 17785 - 6 8372 17786 + 6 8192 17786 3 7884 17787 - 23 6136 17788 - 15 1840 17789 - 23 2512 17790 - 20 508 17956 - 9 2304 17957 + 23 5960 17788 + 15 1556 17789 + 23 2336 17790 + 20 148 17956 + 9 1984 17957 2 1552 17958 - 5 888 17959 - 14 3136 17960 - 20 6064 17961 + 5 728 17959 + 14 2840 17960 + 20 5704 17961 24 6300 17963 - 6 9984 17964 - 15 6848 17965 - 21 7404 17966 - 17 5192 17967 - 21 5776 17968 - 7 3552 17969 - 7 6460 17970 - 11 2192 17971 - 6 8980 17974 - 20 3608 17976 - 14 5396 17977 - 18 4476 17979 - 13 5140 17980 - 14 2328 17981 - 20 0 17983 - 11 5720 17984 - 18 7932 17985 - 21 1132 17987 - 15 1220 17988 - 23 6200 17990 - 16 7948 17991 - 5 8904 17992 - 18 4100 17993 - 21 3152 17996 - 6 3640 17997 + 6 9804 17964 + 15 6564 17965 + 21 7148 17966 + 17 4900 17967 + 21 5520 17968 + 7 3348 17969 + 7 6256 17970 + 11 1756 17971 + 6 8800 17974 + 20 3248 17976 + 14 5100 17977 + 18 4116 17979 + 13 4820 17980 + 14 2032 17981 + 19 9644 17983 + 11 5284 17984 + 18 7572 17985 + 21 876 17987 + 15 936 17988 + 23 6024 17990 + 16 7748 17991 + 5 8744 17992 + 18 3740 17993 + 21 2896 17996 + 6 3460 17997 24 3296 17999 2 4952 18002 - 12 5852 18003 - 6 3952 18004 - 22 7620 18006 - 13 5888 18010 - 21 3368 18013 + 12 5480 18003 + 6 3772 18004 + 22 7316 18006 + 13 5568 18010 + 21 3112 18013 3 1744 18014 - 10 6732 18015 - 16 1068 18018 - 10 5728 18019 - 21 3752 18025 + 10 6296 18015 + 16 868 18018 + 10 5292 18019 + 21 3496 18025 2 9040 18028 - 16 5152 18030 - 9 352 18032 + 16 4952 18030 + 9 32 18032 3 6000 18033 - 14 5620 18035 - 13 1416 18036 - 20 3780 18037 - 12 3472 18039 - 13 8124 18041 - 12 4248 18043 - 19 0 18044 - 12 372 18045 - 5 8968 18046 - 22 496 18209 - 13 8416 18210 - 12 4736 18212 + 14 5324 18035 + 13 1128 18036 + 20 3420 18037 + 12 3100 18039 + 13 7804 18041 + 12 3876 18043 + 18 9712 18044 + 12 0 18045 + 5 8808 18046 + 22 192 18209 + 13 8096 18210 + 12 4364 18212 4 6632 18213 - 20 1308 18214 - 19 6568 18215 - 23 7728 18219 - 9 4752 18221 - 14 32 18222 + 20 948 18214 + 19 6196 18215 + 23 7520 18219 + 9 4432 18221 + 13 9828 18222 24 4996 18223 - 16 5928 18224 - 21 2140 18227 - 13 7592 18228 - 18 2836 18229 - 5 5992 18231 - 18 5432 18234 + 16 5728 18224 + 21 1884 18227 + 13 7272 18228 + 18 2476 18229 + 5 5832 18231 + 18 5072 18234 24 192 18235 - 13 3772 18236 - 17 32 18237 - 23 6104 18238 - 19 4496 18240 - 17 2640 18243 - 8 1460 18244 - 10 8292 18246 - 15 7392 18248 - 15 9540 18249 - 10 7776 18251 - 21 816 18252 - 15 8516 18255 - 9 3632 18256 - 5 824 18257 - 16 5992 18258 - 6 1548 18259 - 16 7488 18260 - 11 3260 18261 - 11 8380 18264 - 6 3576 18265 - 18 1360 18266 + 13 3452 18236 + 16 9940 18237 + 23 5928 18238 + 19 4124 18240 + 17 2348 18243 + 8 1212 18244 + 10 7856 18246 + 15 7108 18248 + 15 9256 18249 + 10 7340 18251 + 21 560 18252 + 15 8232 18255 + 9 3312 18256 + 5 664 18257 + 16 5792 18258 + 6 1368 18259 + 16 7288 18260 + 11 2824 18261 + 11 7944 18264 + 6 3396 18265 + 18 1000 18266 3 8472 18267 - 22 1640 18268 - 9 5536 18269 - 16 6908 18270 - 20 7964 18271 + 22 1336 18268 + 9 5216 18269 + 16 6708 18270 + 20 7604 18271 2 7432 18275 2 3020 18276 - 19 4656 18277 - 22 2448 18278 - 6 7476 18284 - 13 6516 18286 - 21 2364 18287 - 15 7520 18289 - 8 5500 18290 - 5 7148 18293 + 19 4284 18277 + 22 2144 18278 + 6 7296 18284 + 13 6196 18286 + 21 2108 18287 + 15 7236 18289 + 8 5252 18290 + 5 6988 18293 4 7980 18294 - 10 1320 18295 + 10 960 18295 3 4764 18297 5 0 18298 - 21 1196 18299 + 21 940 18299 4 2080 18300 4 6376 18302 - 19 8424 18466 - 8 3420 18473 - 15 4624 18474 - 12 2748 18476 - 10 9564 18477 - 8 9004 18479 - 14 5888 18481 - 16 6748 18482 - 22 8316 18483 - 21 2556 18484 - 8 696 18486 - 9 1412 18492 - 23 944 18493 - 15 7180 18494 - 18 7168 18495 - 9 4072 18497 - 18 732 18498 - 14 4968 18500 + 19 8052 18466 + 8 3172 18473 + 15 4340 18474 + 12 2376 18476 + 10 9128 18477 + 8 8756 18479 + 14 5592 18481 + 16 6548 18482 + 22 8012 18483 + 21 2300 18484 + 8 448 18486 + 9 1092 18492 + 23 440 18493 + 15 6896 18494 + 18 6808 18495 + 9 3752 18497 + 18 372 18498 + 14 4672 18500 5 268 18503 - 19 6536 18504 - 12 8704 18505 - 16 2616 18506 - 15 5828 18507 - 16 9848 18508 - 17 5956 18509 - 6 1644 18510 - 8 6020 18511 - 22 5744 18512 - 20 6544 18513 - 14 7360 18514 + 19 6164 18504 + 12 8332 18505 + 16 2416 18506 + 15 5544 18507 + 16 9648 18508 + 17 5664 18509 + 6 1464 18510 + 8 5772 18511 + 22 5440 18512 + 20 6184 18513 + 14 7064 18514 2 3152 18515 - 10 5476 18517 - 7 1260 18518 - 8 868 18519 + 10 5040 18517 + 7 1056 18518 + 8 620 18519 4 7060 18522 - 22 9952 18524 - 10 3896 18525 - 20 6512 18526 + 22 9648 18524 + 10 3536 18525 + 20 6152 18526 2 6324 18528 - 10 9692 18529 - 6 2156 18530 - 7 552 18531 - 5 7952 18532 - 22 9328 18534 - 19 8100 18535 + 10 9256 18529 + 6 1976 18530 + 7 348 18531 + 5 7792 18532 + 22 9024 18534 + 19 7728 18535 2 8792 18536 - 18 8188 18537 - 11 3164 18538 - 9 4320 18539 - 7 204 18541 - 23 7696 18542 - 23 6168 18543 - 16 2936 18545 - 8 4252 18546 - 11 4372 18547 - 12 0 18548 - 16 1748 18551 - 19 7076 18552 - 18 120 18553 + 18 7828 18537 + 11 2728 18538 + 9 4000 18539 + 7 0 18541 + 23 7488 18542 + 23 5992 18543 + 16 2736 18545 + 8 4004 18546 + 11 3936 18547 + 11 9840 18548 + 16 1548 18551 + 19 6704 18552 + 17 9828 18553 5 192 18558 - 8 1932 18721 - 22 2544 18724 - 12 9888 18725 + 8 1684 18721 + 22 2240 18724 + 12 9516 18725 4 6996 18727 - 6 9364 18732 + 6 9184 18732 24 5188 18734 - 17 1732 18737 + 17 1440 18737 3 3140 18738 - 12 2512 18740 + 12 2140 18740 2 4068 18741 - 15 3124 18742 - 12 6952 18744 - 18 2304 18745 - 21 7340 18746 - 15 4388 18748 - 8 7976 18749 - 13 8680 18750 - 18 7052 18753 - 5 9160 18754 - 14 7704 18755 - 19 2340 18756 + 15 2840 18742 + 12 6580 18744 + 18 1944 18745 + 21 7084 18746 + 15 4104 18748 + 8 7728 18749 + 13 8360 18750 + 18 6692 18753 + 5 9000 18754 + 14 7408 18755 + 19 1968 18756 24 3844 18762 - 22 6028 18765 - 20 6352 18767 - 20 8556 18768 - 22 6972 18769 - 8 1332 18770 - 16 2024 18771 + 22 5724 18765 + 20 5992 18767 + 20 8196 18768 + 22 6668 18769 + 8 1084 18770 + 16 1824 18771 4 7732 18772 - 21 6980 18773 + 21 6724 18773 3 7688 18775 - 15 7488 18776 - 5 8936 18777 - 19 1804 18779 - 13 860 18780 - 17 9272 18781 - 19 7444 18782 - 8 2548 18783 - 14 328 18784 - 19 1772 18785 + 15 7204 18776 + 5 8776 18777 + 19 1432 18779 + 13 572 18780 + 17 8980 18781 + 19 7072 18782 + 8 2300 18783 + 14 32 18784 + 19 1400 18785 2 8588 18786 24 5956 18787 - 21 3120 18788 - 19 3216 18789 - 17 8640 18790 - 15 8928 18792 - 23 1464 18793 - 20 7996 18794 + 21 2864 18788 + 19 2844 18789 + 17 8348 18790 + 15 8644 18792 + 23 960 18793 + 20 7636 18794 2 2240 18795 - 21 1420 18796 - 21 7804 18797 - 13 7528 18798 - 16 6608 18800 - 11 6440 18801 - 5 8680 18804 - 5 7116 18805 - 10 620 18807 - 10 7840 18810 - 14 4504 18811 + 21 1164 18796 + 21 7548 18797 + 13 7208 18798 + 16 6408 18800 + 11 6004 18801 + 5 8520 18804 + 5 6956 18805 + 10 260 18807 + 10 7404 18810 + 14 4208 18811 4 4816 18812 - 17 2036 18813 - 16 4704 18814 - 9 5600 18977 - 22 9920 18978 - 13 5108 18979 - 14 4600 18980 - 19 132 18982 - 7 6524 18983 - 13 7688 18984 + 17 1744 18813 + 16 4504 18814 + 9 5280 18977 + 22 9616 18978 + 13 4788 18979 + 14 4304 18980 + 18 9844 18982 + 7 6320 18983 + 13 7368 18984 4 216 18985 - 13 8584 18986 + 13 8264 18986 24 4696 18988 - 5 1924 18990 - 15 4960 18991 - 13 2272 18992 + 5 1764 18990 + 15 4676 18991 + 13 1952 18992 3 9328 18995 - 20 7360 18996 - 21 5948 18997 - 13 668 18998 - 5 6640 18999 - 6 5492 19000 + 20 7000 18996 + 21 5692 18997 + 13 380 18998 + 5 6480 18999 + 6 5312 19000 4 3516 19001 - 20 4260 19002 - 19 6312 19003 - 17 5288 19004 - 13 5076 19005 - 22 4588 19006 - 17 9368 19007 - 6 9656 19008 - 10 588 19009 - 17 2068 19010 - 12 9560 19012 - 21 688 19013 - 10 2896 19014 - 5 920 19015 - 20 7532 19017 - 7 2764 19018 - 11 480 19020 - 16 5896 19024 - 19 3324 19025 - 8 4904 19026 - 7 3220 19028 - 22 6908 19029 - 14 5824 19030 - 16 2392 19031 - 20 7052 19032 - 21 7468 19033 - 7 7740 19035 + 20 3900 19002 + 19 5940 19003 + 17 4996 19004 + 13 4756 19005 + 22 4284 19006 + 17 9076 19007 + 6 9476 19008 + 10 228 19009 + 17 1776 19010 + 12 9188 19012 + 21 432 19013 + 10 2536 19014 + 5 760 19015 + 20 7172 19017 + 7 2560 19018 + 11 44 19020 + 16 5696 19024 + 19 2952 19025 + 8 4656 19026 + 7 3016 19028 + 22 6604 19029 + 14 5528 19030 + 16 2192 19031 + 20 6692 19032 + 21 7212 19033 + 7 7536 19035 2 8620 19036 - 12 3440 19037 - 20 7596 19038 + 12 3068 19037 + 20 7236 19038 4 2980 19041 3 872 19042 - 16 5624 19043 - 14 7264 19044 - 11 3292 19046 - 23 4708 19047 - 8 1156 19048 - 7 3868 19049 - 23 7784 19050 - 16 1264 19051 - 23 1528 19052 - 7 2964 19053 + 16 5424 19043 + 14 6968 19044 + 11 2856 19046 + 23 4532 19047 + 8 908 19048 + 7 3664 19049 + 23 7576 19050 + 16 1064 19051 + 23 1024 19052 + 7 2760 19053 4 7644 19055 - 5 5472 19056 - 13 5268 19057 - 15 1124 19058 - 10 6700 19059 - 13 6612 19060 - 11 4100 19061 - 5 2884 19062 - 8 7944 19064 - 6 5644 19066 + 5 5312 19056 + 13 4948 19057 + 15 840 19058 + 10 6264 19059 + 13 6292 19060 + 11 3664 19061 + 5 2724 19062 + 8 7696 19064 + 6 5464 19066 2 3504 19068 2 1208 19069 - 22 952 19070 - 10 8356 19233 + 22 648 19070 + 10 7920 19233 3 9296 19234 - 20 5740 19236 - 20 6956 19237 - 5 8744 19238 - 8 3516 19239 - 5 748 19243 - 13 1352 19244 - 18 5496 19245 - 23 2384 19246 - 10 4896 19248 - 23 2544 19251 - 17 4804 19252 - 21 4828 19253 - 5 2724 19254 - 16 6056 19255 - 13 9744 19256 - 14 5096 19257 + 20 5380 19236 + 20 6596 19237 + 5 8584 19238 + 8 3268 19239 + 5 588 19243 + 13 1064 19244 + 18 5136 19245 + 23 2208 19246 + 10 4536 19248 + 23 2368 19251 + 17 4512 19252 + 21 4572 19253 + 5 2564 19254 + 16 5856 19255 + 13 9424 19256 + 14 4800 19257 24 2384 19258 - 14 5492 19259 - 6 1484 19260 - 20 6000 19261 - 20 5772 19262 - 13 7720 19263 - 8 996 19264 - 13 5952 19265 + 14 5196 19259 + 6 1304 19260 + 20 5640 19261 + 20 5412 19262 + 13 7400 19263 + 8 748 19264 + 13 5632 19265 2 8524 19266 - 16 9296 19267 - 7 2148 19268 + 16 9096 19267 + 7 1944 19268 2 332 19269 - 5 1368 19271 - 9 1896 19272 - 8 3484 19273 - 16 5592 19276 + 5 1208 19271 + 9 1576 19272 + 8 3236 19273 + 16 5392 19276 3 6064 19277 - 9 6396 19278 + 9 6076 19278 4 5976 19279 24 6716 19280 - 16 1684 19281 - 10 1256 19282 + 16 1484 19281 + 10 896 19282 24 4920 19287 - 21 2760 19289 - 5 4404 19291 - 13 6676 19292 - 21 5884 19293 - 12 8412 19294 + 21 2504 19289 + 5 4244 19291 + 13 6356 19292 + 21 5628 19293 + 12 8040 19294 4 4752 19295 - 16 4896 19296 - 19 4140 19297 + 16 4696 19296 + 19 3768 19297 3 8580 19298 - 5 2628 19299 + 5 2468 19299 24 1288 19300 - 11 1444 19301 - 23 2224 19303 - 23 4676 19304 - 5 2236 19307 - 16 5024 19308 - 21 352 19309 - 10 6392 19314 - 7 9136 19316 - 19 2960 19317 + 11 1008 19301 + 23 2048 19303 + 23 4500 19304 + 5 2076 19307 + 16 4824 19308 + 21 96 19309 + 10 5956 19314 + 7 8900 19316 + 19 2588 19317 3 6400 19318 - 15 8896 19322 - 12 4916 19324 - 11 7932 19325 + 15 8612 19322 + 12 4544 19324 + 11 7496 19325 24 6172 19326 - 9 2400 19489 - 19 7476 19491 - 5 9788 19492 + 9 2080 19489 + 19 7104 19491 + 5 9628 19492 3 9232 19493 24 64 19496 - 9 3352 19497 - 9 2196 19498 - 6 1420 19502 - 16 7872 19503 - 13 2336 19505 - 20 476 19506 - 12 468 19507 - 15 7984 19508 - 12 4216 19509 + 9 3032 19497 + 9 1876 19498 + 6 1240 19502 + 16 7672 19503 + 13 2016 19505 + 20 116 19506 + 12 96 19507 + 15 7700 19508 + 12 3844 19509 2 5204 19511 - 16 9072 19512 - 21 2108 19515 + 16 8872 19512 + 21 1852 19515 5 396 19516 - 21 4404 19518 - 20 104 19519 + 21 4148 19518 + 19 9748 19519 24 6780 19520 - 18 2804 19521 - 15 7920 19522 - 23 2736 19523 - 13 6856 19524 - 5 6920 19527 - 13 4212 19528 + 18 2444 19521 + 15 7636 19522 + 23 2560 19523 + 13 6536 19524 + 5 6760 19527 + 13 3892 19528 3 9372 19530 - 15 3452 19532 - 14 5000 19533 + 15 3168 19532 + 14 4704 19533 2 9640 19535 - 16 9040 19536 + 16 8840 19536 2 3344 19537 - 19 4764 19538 - 8 5804 19539 - 19 4204 19540 - 13 5792 19541 + 19 4392 19538 + 8 5556 19539 + 19 3832 19540 + 13 5472 19541 3 5872 19542 - 22 304 19543 - 21 9584 19546 - 8 7172 19547 - 9 5632 19548 - 12 1760 19550 + 22 0 19543 + 21 9360 19546 + 8 6924 19547 + 9 5312 19548 + 12 1388 19550 4 9924 19552 - 21 2172 19553 + 21 1916 19553 2 4780 19556 - 19 8132 19558 - 9 4784 19559 - 13 6156 19560 - 21 848 19561 - 8 4700 19563 - 10 2864 19566 - 23 9376 19568 + 19 7760 19558 + 9 4464 19559 + 13 5836 19560 + 21 592 19561 + 8 4452 19563 + 10 2504 19566 + 23 9168 19568 4 7612 19569 - 13 3548 19570 - 6 2908 19571 - 12 9464 19572 - 20 7328 19573 - 16 1620 19574 - 7 3092 19576 - 5 856 19579 - 11 2064 19580 + 13 3228 19570 + 6 2728 19571 + 12 9092 19572 + 20 6968 19573 + 16 1420 19574 + 7 2888 19576 + 5 696 19579 + 11 1628 19580 4 3324 19581 2 3568 19582 - 20 8984 19745 - 20 4040 19746 - 11 8488 19747 - 8 3836 19749 - 14 2360 19750 - 14 8868 19751 - 17 2884 19753 - 21 1260 19754 - 22 3672 19755 + 20 8624 19745 + 20 3680 19746 + 11 8052 19747 + 8 3588 19749 + 14 2064 19750 + 14 8572 19751 + 17 2592 19753 + 21 1004 19754 + 22 3368 19755 5 364 19757 - 10 1352 19761 - 21 5136 19763 - 5 2520 19765 - 9 9116 19766 + 10 992 19761 + 21 4880 19763 + 5 2360 19765 + 9 8796 19766 24 6524 19767 - 19 404 19768 + 19 32 19768 4 6664 19769 - 6 8948 19770 - 22 3140 19771 - 22 2816 19772 - 13 892 19773 - 17 5664 19774 - 14 1776 19775 + 6 8768 19770 + 22 2836 19771 + 22 2512 19772 + 13 604 19773 + 17 5372 19774 + 14 1480 19775 4 6568 19776 - 13 9872 19778 - 9 1476 19780 - 23 1264 19782 - 20 4540 19783 - 19 4528 19784 - 11 8988 19785 - 11 9588 19786 - 8 3356 19787 - 19 4796 19788 - 19 6440 19789 - 15 8104 19790 - 11 7228 19791 - 23 4936 19792 - 17 64 19793 - 12 7796 19794 - 6 7572 19795 + 13 9552 19778 + 9 1156 19780 + 23 760 19782 + 20 4180 19783 + 19 4156 19784 + 11 8552 19785 + 11 9152 19786 + 8 3108 19787 + 19 4920 19788 + 19 6068 19789 + 15 7820 19790 + 11 6792 19791 + 23 4760 19792 + 16 9972 19793 + 12 7424 19794 + 6 7392 19795 3 5808 19797 - 18 8124 19799 - 22 6940 19800 - 8 1524 19801 - 12 3868 19803 - 19 9952 19804 - 22 9296 19806 - 21 2076 19807 - 10 1448 19809 - 21 6884 19810 + 18 7764 19799 + 22 6636 19800 + 8 1276 19801 + 12 3496 19803 + 19 9580 19804 + 22 8992 19806 + 21 1820 19807 + 10 1088 19809 + 21 6628 19810 5 300 19811 - 17 2396 19813 - 9 9180 19815 - 22 1864 19816 + 17 2104 19813 + 9 8860 19815 + 22 1560 19816 4 3420 19818 - 11 8956 19819 - 9 5068 19820 - 18 4444 19821 - 10 1084 19822 - 14 4632 19823 - 13 828 19824 - 16 664 1982... [truncated message content] |
|
From: <ben...@us...> - 2006-06-18 22:35:07
|
Revision: 746 Author: benoitcerrina Date: 2006-06-18 15:34:56 -0700 (Sun, 18 Jun 2006) ViewCVS: http://svn.sourceforge.net/padict/?rev=746&view=rev Log Message: ----------- correct crash when deleted kanji from hotlist with no hotlist selected Modified Paths: -------------- branches/unstable/padict/CHANGELOG branches/unstable/padict/redesign/lib/fonts/drawkanji.c branches/unstable/padict/redesign/lib/kjdef/definition.c branches/unstable/padict/redesign/program/padict/kjdef/kjdefForm.c Modified: branches/unstable/padict/CHANGELOG =================================================================== --- branches/unstable/padict/CHANGELOG 2006-05-28 08:41:03 UTC (rev 745) +++ branches/unstable/padict/CHANGELOG 2006-06-18 22:34:56 UTC (rev 746) @@ -1,7 +1,11 @@ 0.9.0 => 0.9.1 +rev 745: correct bug in delete kanji from hotlist (crash if no hotlist active corrected) rev 741: add kanji to taka and jstroke rev 736: bug corrections in the add to hotlist dialog for kanji rev 732: correct bug 1179944 now deactivate write anywhere when going into the kanji drawing screen +rev 736: bug corrections in the add to hotlist dialog for kanji +rev 732: correct bug 1179944 now deactivate write anywhere when going +into the kanji drawing screen rev 730: Save new version of kjdef pref earlier when it is found that the one on the machine is out of date rev 729: correct bug 1479367 rev 728: implement kanji hotlists, bug fixes, taka corrections Modified: branches/unstable/padict/redesign/lib/fonts/drawkanji.c =================================================================== --- branches/unstable/padict/redesign/lib/fonts/drawkanji.c 2006-05-28 08:41:03 UTC (rev 745) +++ branches/unstable/padict/redesign/lib/fonts/drawkanji.c 2006-06-18 22:34:56 UTC (rev 746) @@ -357,9 +357,9 @@ WinSetForeColorRGB ( &lCurColor, &lOldColor); // this function is for PalmOS>3.5, so we can use WinDrawPixel... -// WinDrawPixel(lPoint.x+x,lPoint.y+y); + // WinDrawPixel(lPoint.x+x,lPoint.y+y); WinDrawLine(lPoint.x+x,lPoint.y+y, lPoint.x+x,lPoint.y+y ); - WinSetForeColorRGB (&lOldColor, 0); + WinSetForeColorRGB (&lOldColor, 0); x++; } if (x==width) { @@ -697,7 +697,7 @@ { UInt16 kanji; - UInt wrap, i; + UInt wrap, i, asciiLength; // wrap is the value of x where we don't have enough space // to draw another character @@ -710,13 +710,21 @@ x = 0; *y += (17); } - kanji = str->pch[i]; - i++; - kanji = (kanji << 8 & 0x0ff00) | str->pch[i]; - i++; + if (str->pch[i] & 0x80) + { + kanji = str->pch[i]; + i++; + kanji = (kanji << 8 & 0x0ff00) | str->pch[i]; + i++; + x += FNTdrawKanji(kanji,x,*y); + } + else + { + WinDrawChar(str->pch[i], x, *y); + x += FntCharWidth (str->pch[i]); + } //fontDrawKanji(&kanji, x, *y); // FNTdrawKanji(kanji,x,*y); - x += FNTdrawKanji(kanji,x,*y); } return x; } Modified: branches/unstable/padict/redesign/lib/kjdef/definition.c =================================================================== --- branches/unstable/padict/redesign/lib/kjdef/definition.c 2006-05-28 08:41:03 UTC (rev 745) +++ branches/unstable/padict/redesign/lib/kjdef/definition.c 2006-06-18 22:34:56 UTC (rev 746) @@ -1347,7 +1347,8 @@ UInt32 lLastRecordSize = 0; UInt16 lNbRecords = 0; - + if (!iDB) + return false; lRec = DmGetRecord(iDB, id / KANJILIST_ENTRIES_PER_RECORD); if ( !lRec) return false; Modified: branches/unstable/padict/redesign/program/padict/kjdef/kjdefForm.c =================================================================== --- branches/unstable/padict/redesign/program/padict/kjdef/kjdefForm.c 2006-05-28 08:41:03 UTC (rev 745) +++ branches/unstable/padict/redesign/program/padict/kjdef/kjdefForm.c 2006-06-18 22:34:56 UTC (rev 746) @@ -489,20 +489,27 @@ DmOpenRef lDB = HLGetHotlistDB(HLKanji); UInt32 lNbRecords = KJDEFNbRecords(lDB); UInt32 lIndex = KJDEFGetIndex(); - KJDEFDeleteByIndex(lDB, lIndex); - if (lIndex == lNbRecords-1) //if the index is the last one + if (lDB) { - if (lIndex != 0) //but not the first one - { - KJDEFSetIndex(lIndex - 1); //put the current index as the new last index + KJDEFDeleteByIndex(lDB, lIndex); + if (lIndex == lNbRecords-1) //if the index is the last one + { + if (lIndex != 0) //but not the first one + { + KJDEFSetIndex(lIndex - 1); //put the current index as the new last index + } + else + { //there was only one index the hotlist will become empty + HLSetCurCategory(HLKanji, data_type_browse); + HLRedrawCategory(HLKanji); + } } - else - { //there was only one index the hotlist will become empty - HLSetCurCategory(HLKanji, data_type_browse); - HLRedrawCategory(HLKanji); - } + KJDEFDraw(true); } - KJDEFDraw(true); + else + { + COMerror("No active hotlist", 0, 0); + } } break; case m_itemID_ec: @@ -813,9 +820,13 @@ { // Draw the english definition UInt i = 0, wrap = 0, pos = 0, len=0, palmFontHeight; + FontID oldFont = FntSetFont(largeFont); palmFontHeight = FntCharHeight(); if (!str) + { + FntSetFont(oldFont); return; + } for (i = 0; str[i] != '\0'; i++) { len += FntCharWidth (str[i]); @@ -837,6 +848,7 @@ WinDrawChars(str + pos, wrap, 0, *y); *y += palmFontHeight; } + FntSetFont(oldFont); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ben...@us...> - 2006-06-19 23:40:54
|
Revision: 747 Author: benoitcerrina Date: 2006-06-19 16:40:43 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/padict/?rev=747&view=rev Log Message: ----------- correct bug where the wrong font was used for jstroke definition correctly reset the number of strokes when using reset in multirad Modified Paths: -------------- branches/unstable/padict/CHANGELOG branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_search_mrad.c branches/unstable/padict/redesign/program/padict/kjdef/kjdefForm.c Modified: branches/unstable/padict/CHANGELOG =================================================================== --- branches/unstable/padict/CHANGELOG 2006-06-18 22:34:56 UTC (rev 746) +++ branches/unstable/padict/CHANGELOG 2006-06-19 23:40:43 UTC (rev 747) @@ -1,16 +1,17 @@ 0.9.0 => 0.9.1 -rev 745: correct bug in delete kanji from hotlist (crash if no hotlist active corrected) +rev 747: correct bug where the wrong font was used for jstroke definition + correctly reset the number of strokes when using reset in multirad +rev 746: correct bug in delete kanji from hotlist (crash if no hotlist active corrected) rev 741: add kanji to taka and jstroke rev 736: bug corrections in the add to hotlist dialog for kanji -rev 732: correct bug 1179944 now deactivate write anywhere when going into the kanji drawing screen -rev 736: bug corrections in the add to hotlist dialog for kanji rev 732: correct bug 1179944 now deactivate write anywhere when going into the kanji drawing screen rev 730: Save new version of kjdef pref earlier when it is found that the one on the machine is out of date rev 729: correct bug 1479367 rev 728: implement kanji hotlists, bug fixes, taka corrections rev 722: add the hotlist creator -rev 720: taka corrections jstroke corrections +rev 720: Correction in the testDB behavior, correct bug where the edited hotlist (for delete or rename) was not the correct one. + taka corrections jstroke corrections rev 719: bug fixes, taka corrections rev 715: hotlists selection list is now sorted rev 714: import old hotlists (only work if the dictionary was not changed) Modified: branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_search_mrad.c =================================================================== --- branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_search_mrad.c 2006-06-18 22:34:56 UTC (rev 746) +++ branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_search_mrad.c 2006-06-19 23:40:43 UTC (rev 747) @@ -452,6 +452,17 @@ mrDrawGadgets(frm); mrCalcScrollbar(frm); mrFillKanaTable(frm); + field=FrmGetObjectPtr(frm,COMFrmGetObjectIndex(frm,mrad_fieldID_minstrokes)); + if (FldGetTextPtr(field)) + { + FldDelete(field, 0, StrLen(FldGetTextPtr(field))); + } + field=FrmGetObjectPtr(frm,COMFrmGetObjectIndex(frm,mrad_fieldID_maxstrokes)); + if (FldGetTextPtr(field)) { + FldDelete(field, 0, StrLen(FldGetTextPtr(field))); + } + + break; case mrad_gadgetID_search: Modified: branches/unstable/padict/redesign/program/padict/kjdef/kjdefForm.c =================================================================== --- branches/unstable/padict/redesign/program/padict/kjdef/kjdefForm.c 2006-06-18 22:34:56 UTC (rev 746) +++ branches/unstable/padict/redesign/program/padict/kjdef/kjdefForm.c 2006-06-19 23:40:43 UTC (rev 747) @@ -699,6 +699,8 @@ Int32 lJstrokeToken = 0; Char * lJstrokeDef = 0; UInt16 lDefinitionWidth = 0; +// FontID oldFont = FntSetFont(largeFont); + ErrFatalDisplayIf(!lFormData, "Incorrectly initialized definition form"); //TODO change this to use the padict font description fontSize = fontWidth= 16; //fontGetSize(); @@ -812,6 +814,7 @@ //screenFormat, nativeFormat, &err); +// FntSetFont(oldFont); return hOffscreen; } @@ -820,11 +823,11 @@ { // Draw the english definition UInt i = 0, wrap = 0, pos = 0, len=0, palmFontHeight; - FontID oldFont = FntSetFont(largeFont); +// FontID oldFont = FntSetFont(largeFont); palmFontHeight = FntCharHeight(); if (!str) { - FntSetFont(oldFont); +// FntSetFont(oldFont); return; } for (i = 0; str[i] != '\0'; i++) @@ -848,7 +851,7 @@ WinDrawChars(str + pos, wrap, 0, *y); *y += palmFontHeight; } - FntSetFont(oldFont); +// FntSetFont(oldFont); } @@ -869,6 +872,7 @@ Char * lFilter = 0; FormType * frm = FrmGetActiveForm(); UInt16 lDefinitionWidth; +// FontID oldOldFont = FntSetFont(largeFont); fontSize = 16; //fontGetSize(); palmFontHeight = FntCharHeight(); hOriginal = WinSetDrawWindow(lFormData->hOffscreen); @@ -998,6 +1002,7 @@ } } WinSetDrawWindow(hOriginal); +// FntSetFont(oldOldFont); } static void KJDEFPaint (UInt offset) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ben...@us...> - 2006-07-09 06:51:31
|
Revision: 748 Author: benoitcerrina Date: 2006-07-08 23:50:44 -0700 (Sat, 08 Jul 2006) ViewCVS: http://svn.sourceforge.net/padict/?rev=748&view=rev Log Message: ----------- apply patch for case sensitive filesystem Modified Paths: -------------- branches/unstable/padict/Trainer/trainer.c branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_addtocategory.c branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_addtocategory.h branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_globals.c branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_search_mrad.c branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_search_romaji.c branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_search_romaji.h branches/unstable/padict/include/romaji.h branches/unstable/padict/padict.c branches/unstable/padict/redesign/lib/KingKanji/KingKanji.c branches/unstable/padict/redesign/lib/VocabList/VocabList.c branches/unstable/padict/redesign/lib/common/UICommon.c branches/unstable/padict/redesign/lib/hotlist/hotlist.c branches/unstable/padict/redesign/lib/hotlist/hotlist.h branches/unstable/padict/redesign/lib/japconversions/romaji.c branches/unstable/padict/redesign/lib/kjdef/kjdef.h branches/unstable/padict/redesign/lib/multiradicals/radicals.c branches/unstable/padict/redesign/lib/sod/taka.c branches/unstable/padict/redesign/program/padict/common/menu.c branches/unstable/padict/redesign/program/padict/result/RESMultidisplay.c branches/unstable/padict/redesign/program/padict/result/RESSingledisplay.c branches/unstable/padict/redesign/program/padict/search/pocketkanji/kjpad.c branches/unstable/padict/testDB.c Modified: branches/unstable/padict/Trainer/trainer.c =================================================================== --- branches/unstable/padict/Trainer/trainer.c 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/Trainer/trainer.c 2006-07-09 06:50:44 UTC (rev 748) @@ -32,7 +32,7 @@ //#include "../include/UICommon.h" #include "../redesign/lib/pdict/pdict.h" #include "../redesign/lib/common/common.h" -//#include "../Preferences/preferences.h" +//#include "../preferences/preferences.h" #include "../redesign/lib/hotlist/hotlist.h" #include "../redesign/lib/preferences/preferences.h" #include "../redesign/lib/hotlist/resources.h" Modified: branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_addtocategory.c =================================================================== --- branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_addtocategory.c 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_addtocategory.c 2006-07-09 06:50:44 UTC (rev 748) @@ -23,7 +23,7 @@ #include "dbdict_df_addtocategory.h" //#include "resources.h" #include "../../include/resources_main.h" -//#include "../../Preferences/preferences.h" +//#include "../../preferences/preferences.h" #include "../../redesign/lib/hotlist/hotlist.h" #include "../../redesign/lib/hotlist/resources.h" #include "dbdict_df_globals.h" Modified: branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_addtocategory.h =================================================================== --- branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_addtocategory.h 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_addtocategory.h 2006-07-09 06:50:44 UTC (rev 748) @@ -31,7 +31,7 @@ #include "../../redesign/lib/pdict/pdict.h" #include "../../redesign/lib/datadriver/datadriver.h" #include "../../include/sections.h" -//#include "../../Preferences/preferences.h" +//#include "../../preferences/preferences.h" // display "add to category" dialog // returns true if "OK" was selected. Category to add record to is stored in Pref->HotlistAddCategory //Boolean df_addtocategory() DB_DICT_SECTION; Modified: branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_globals.c =================================================================== --- branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_globals.c 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_globals.c 2006-07-09 06:50:44 UTC (rev 748) @@ -18,7 +18,7 @@ */ #include "dbdict_df_globals.h" -//#include "../../Preferences/preferences.h" +//#include "../../preferences/preferences.h" #include "../../include/resources_main.h" #include "../../include/main_callbacks.h" //#include "../../include/UICommon.h" Modified: branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_search_mrad.c =================================================================== --- branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_search_mrad.c 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_search_mrad.c 2006-07-09 06:50:44 UTC (rev 748) @@ -37,7 +37,7 @@ #include "../../redesign/program/padict/search/kana/kana.h" // some functions (DrawStuff) reused #include "../../redesign/program/padict/search/resources.h" // formID_dbdict_search_default_kana #include "../../redesign/program/padict/search/kana/resources.h" // sk_tableID_kana -//#include "../../Preferences/preferences.h" // Prefs (the search string is stored there!) +//#include "../../preferences/preferences.h" // Prefs (the search string is stored there!) #include "../../redesign/lib/common/common.h" //common stuff COMGetObjectIdByPtr #include "../../redesign/lib/dbaccess/dbaccess.h" //#include "../../include/UICommon.h" // UI stuff (HandleHelpMenu, DrawCursor, mGetObjectIdByPtr) Modified: branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_search_romaji.c =================================================================== --- branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_search_romaji.c 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_search_romaji.c 2006-07-09 06:50:44 UTC (rev 748) @@ -34,7 +34,7 @@ #include "dbdict_df_search_romaji.h" // some internal includes -//#include "../../Preferences/preferences.h" // Prefs (the search string is stored there!) +//#include "../../preferences/preferences.h" // Prefs (the search string is stored there!) #include "../../redesign/lib/japconversions/japconversions.h" // helps us drawing the kanji #include "../../redesign/lib/searchstring/searchstring.h" // the code for the searchstring table #include "../../redesign/lib/searchstring/resources.h" // resource ids for the searchstring table Modified: branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_search_romaji.h =================================================================== --- branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_search_romaji.h 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/dbmodule_dict/search_default/dbdict_df_search_romaji.h 2006-07-09 06:50:44 UTC (rev 748) @@ -19,7 +19,7 @@ #ifndef __form_search_romaji_h #define __form_search_romaji_h #include "../../include/sections.h" -//#include "../../Preferences/preferences.h" +//#include "../../preferences/preferences.h" Boolean FormHandlerSearchRomaji(EventPtr event) JSTROKE_SECTION; Modified: branches/unstable/padict/include/romaji.h =================================================================== --- branches/unstable/padict/include/romaji.h 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/include/romaji.h 2006-07-09 06:50:44 UTC (rev 748) @@ -19,7 +19,7 @@ #ifndef __romaji_h #define __romaji_h -//#include "../Preferences/preferences.h" +//#include "../preferences/preferences.h" //#include "../redesign/program/padict/preferences/preferences.h" #include "main_callbacks.h" /* Modified: branches/unstable/padict/padict.c =================================================================== --- branches/unstable/padict/padict.c 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/padict.c 2006-07-09 06:50:44 UTC (rev 748) @@ -40,7 +40,7 @@ #include "redesign/lib/pdic/pdic.h" #include "redesign/lib/hotlist/hotlist.h" #include "redesign/program/padict/sod/sod.h" -//#include "Preferences/preferences.h" +//#include "preferences/preferences.h" #include "include/resources_main.h" #include "redesign/lib/common/events.h" //#include "redesign/lib/common/resources.h" Modified: branches/unstable/padict/redesign/lib/KingKanji/KingKanji.c =================================================================== --- branches/unstable/padict/redesign/lib/KingKanji/KingKanji.c 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/redesign/lib/KingKanji/KingKanji.c 2006-07-09 06:50:44 UTC (rev 748) @@ -4,8 +4,8 @@ #include "../common/common.h" //#include "../include/UICommon.h" #include "KingKanji.h" -#include "../Vocablist/Vocablist.h" -//#include "../Preferences/preferences.h" +#include "../VocabList/VocabList.h" +//#include "../preferences/preferences.h" static QuizzOpenedLessonWorking *QuizzGetKKLesson() QUIZZ_SECTION; static void QuizzFreeKKLesson(QuizzOpenedLessonWorking* i2Free) QUIZZ_SECTION; Modified: branches/unstable/padict/redesign/lib/VocabList/VocabList.c =================================================================== --- branches/unstable/padict/redesign/lib/VocabList/VocabList.c 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/redesign/lib/VocabList/VocabList.c 2006-07-09 06:50:44 UTC (rev 748) @@ -4,7 +4,7 @@ #include "../common/common.h" //#include "../include/UICommon.h" #include "VocabList.h" -//#include "../Preferences/preferences.h" +//#include "../preferences/preferences.h" #define VOCABLIST_ENTRIES_PER_RECORD 50 // VOCABLIST Format: Modified: branches/unstable/padict/redesign/lib/common/UICommon.c =================================================================== --- branches/unstable/padict/redesign/lib/common/UICommon.c 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/redesign/lib/common/UICommon.c 2006-07-09 06:50:44 UTC (rev 748) @@ -1,14 +1,16 @@ //#include "resources_main.h" -//#include "../Preferences/preferences.h" +//#include "../preferences/preferences.h" #include <TblGlue.h> #include "../hardware/hardware.h" #include "common.h" //#include "resources.h" #include "../fonts/fonts.h" // helps us drawing the kanji #include "../PalmResize-1-2-5/DIA.h" +/* #ifdef SUPPORT_DIA_SONY #include <SonyCLIE.h> #endif +*/ Boolean COMGadgetHandler( FormPtr frm, UInt16 gadgetID, EventPtr event, UInt16 cornerDiam) { Boolean penDown; Modified: branches/unstable/padict/redesign/lib/hotlist/hotlist.c =================================================================== --- branches/unstable/padict/redesign/lib/hotlist/hotlist.c 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/redesign/lib/hotlist/hotlist.c 2006-07-09 06:50:44 UTC (rev 748) @@ -23,7 +23,7 @@ #include "hotlist.h" #include "resources.h" -#include "../Preferences/preferences.h" +#include "../preferences/preferences.h" //#include "../include/resources_main.h" //#include "../include/UICommon.h" #include "../common/common.h" Modified: branches/unstable/padict/redesign/lib/hotlist/hotlist.h =================================================================== --- branches/unstable/padict/redesign/lib/hotlist/hotlist.h 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/redesign/lib/hotlist/hotlist.h 2006-07-09 06:50:44 UTC (rev 748) @@ -34,7 +34,7 @@ #include <Form.h> #include "../datadriver/datadriver.h" #include "../pdict/pdict.h" -#include "../vocablist/vocablist.h" +#include "../VocabList/VocabList.h" #include "../kjdef/kjdef.h" #define HOTLIST_SECTION __attribute__ ((section ("hlsec"))) // as the search category is the first, it has 0 as ID... Modified: branches/unstable/padict/redesign/lib/japconversions/romaji.c =================================================================== --- branches/unstable/padict/redesign/lib/japconversions/romaji.c 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/redesign/lib/japconversions/romaji.c 2006-07-09 06:50:44 UTC (rev 748) @@ -40,7 +40,7 @@ #include "romaji_scanner.h" // some internal includes -#include "../Preferences/preferences.h" // Prefs (the search string is stored there!) +#include "../preferences/preferences.h" // Prefs (the search string is stored there!) Modified: branches/unstable/padict/redesign/lib/kjdef/kjdef.h =================================================================== --- branches/unstable/padict/redesign/lib/kjdef/kjdef.h 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/redesign/lib/kjdef/kjdef.h 2006-07-09 06:50:44 UTC (rev 748) @@ -19,7 +19,7 @@ #define DEFINITION_H_ /* Width of the definition offscreen */ #include "../common/common.h" -#include "../Preferences/preferences.h" +#include "../preferences/preferences.h" #include "../japconversions/japconversions.h" //for the Kanji type #define DEF_SECTION __attribute__ ((section ("kjdef"))) Modified: branches/unstable/padict/redesign/lib/multiradicals/radicals.c =================================================================== --- branches/unstable/padict/redesign/lib/multiradicals/radicals.c 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/redesign/lib/multiradicals/radicals.c 2006-07-09 06:50:44 UTC (rev 748) @@ -45,7 +45,7 @@ //#include <SysEvent.h> //#include <Form.h> //#include <PalmCompatibility.h> -//#include "../Preferences/preferences.h" +//#include "../preferences/preferences.h" #include "../dbaccess/dbaccess.h" #include "../common/common.h" Modified: branches/unstable/padict/redesign/lib/sod/taka.c =================================================================== --- branches/unstable/padict/redesign/lib/sod/taka.c 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/redesign/lib/sod/taka.c 2006-07-09 06:50:44 UTC (rev 748) @@ -17,7 +17,7 @@ #include <StringMgr.h> #include "sod.h" #include "../japconversions/japconversions.h" -//#include "../Preferences/preferences.h" +//#include "../preferences/preferences.h" //#include "../include/main_callbacks.h" #include "../dbaccess/dbaccess.h" //#include "../include/events.h" Modified: branches/unstable/padict/redesign/program/padict/common/menu.c =================================================================== --- branches/unstable/padict/redesign/program/padict/common/menu.c 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/redesign/program/padict/common/menu.c 2006-07-09 06:50:44 UTC (rev 748) @@ -27,7 +27,7 @@ #include "../../../lib/common/common.h" //#include "include/main_callbacks.h" //#include "include/resources_main.h" -//#include "Preferences/preferences.h" +//#include "preferences/preferences.h" //#include "include/UICommon.h" Boolean COMhandle_menu(EventPtr event) Modified: branches/unstable/padict/redesign/program/padict/result/RESMultidisplay.c =================================================================== --- branches/unstable/padict/redesign/program/padict/result/RESMultidisplay.c 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/redesign/program/padict/result/RESMultidisplay.c 2006-07-09 06:50:44 UTC (rev 748) @@ -27,7 +27,7 @@ //#include "../../include/default/drawkanji.h" #include "../../../lib/fonts/fonts.h" -//#include "../../Preferences/preferences.h" +//#include "../../preferences/preferences.h" #include "resources.h" //#include "../../include/resources_main.h" #include "result.h" Modified: branches/unstable/padict/redesign/program/padict/result/RESSingledisplay.c =================================================================== --- branches/unstable/padict/redesign/program/padict/result/RESSingledisplay.c 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/redesign/program/padict/result/RESSingledisplay.c 2006-07-09 06:50:44 UTC (rev 748) @@ -37,7 +37,7 @@ #include "../../../lib/pdict/pdict.h" #include "../../../lib/common/common.h" //#include "dbdict_df_globals.h" -//#include "../../Preferences/preferences.h" +//#include "../../preferences/preferences.h" #include "../../../lib/hotlist/hotlist.h" #include "../../../lib/hotlist/resources.h" #include "../common/resources.h" //for COMhandle_menu Modified: branches/unstable/padict/redesign/program/padict/search/pocketkanji/kjpad.c =================================================================== --- branches/unstable/padict/redesign/program/padict/search/pocketkanji/kjpad.c 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/redesign/program/padict/search/pocketkanji/kjpad.c 2006-07-09 06:50:44 UTC (rev 748) @@ -62,7 +62,7 @@ //#include "../dbmodule_dict/search_default/dbdict_df_globals.h" //#include "../dbmodule_dict/search_default/dbdict_df_search_kana.h" -//#include "../Preferences/preferences.h" // preferences & temporary database +//#include "../preferences/preferences.h" // preferences & temporary database #include "../../../../lib/japconversions/japconversions.h" #include "../../../../lib/jstroke/engine/engine.h" #include "../../../../lib/jstroke/gadget/gadget.h" Modified: branches/unstable/padict/testDB.c =================================================================== --- branches/unstable/padict/testDB.c 2006-06-19 23:40:43 UTC (rev 747) +++ branches/unstable/padict/testDB.c 2006-07-09 06:50:44 UTC (rev 748) @@ -38,7 +38,7 @@ #include "Trainer/TestKanji.h" //#include "pocketkanji/kjpadinc.h" #include "Trainer/TestKanji_autores.h" -//#include "Preferences/preferences.h" +//#include "preferences/preferences.h" #include "include/resources_main.h" //#include "redesign/lib/hardware/hardware.h" #include "redesign/lib/fonts/fonts.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ben...@us...> - 2006-07-09 23:19:50
|
Revision: 751 Author: benoitcerrina Date: 2006-07-09 16:19:34 -0700 (Sun, 09 Jul 2006) ViewCVS: http://svn.sourceforge.net/padict/?rev=751&view=rev Log Message: ----------- correct typo in error message better clean up Modified Paths: -------------- branches/unstable/padict/CHANGELOG branches/unstable/padict/redesign/lib/common/Makefile branches/unstable/padict/redesign/lib/hotlist/Makefile branches/unstable/padict/redesign/lib/preferences/preferencesNew.c branches/unstable/padict/redesign/program/padict/result/Makefile Modified: branches/unstable/padict/CHANGELOG =================================================================== --- branches/unstable/padict/CHANGELOG 2006-07-09 07:01:12 UTC (rev 750) +++ branches/unstable/padict/CHANGELOG 2006-07-09 23:19:34 UTC (rev 751) @@ -21,7 +21,7 @@ modified JIS: 0x3E21, 0x4849, 0x402F, 0x317C, 0x3A57, 0x4424, 0x4268, 0x446F, 0x497E, 0x387A, 0x394D, 0x3B65 added: -JIS: 0x4f35, 0x5f6a, 0x3d6c, 0x3262, 0x3264, 0x4d4c, 0x7321, 0x4566 +JIS: 0x4f35, 0x5f6a, 0x3d6c, 0x3262, 0x3264, 0x4d4c, 0x7321, 0x4566, 0x4637 JStroke corrections: add variants Modified: branches/unstable/padict/redesign/lib/common/Makefile =================================================================== --- branches/unstable/padict/redesign/lib/common/Makefile 2006-07-09 07:01:12 UTC (rev 750) +++ branches/unstable/padict/redesign/lib/common/Makefile 2006-07-09 23:19:34 UTC (rev 751) @@ -51,7 +51,7 @@ $(MAKE) -C $@ clean: - @rm -f *.[oad] *.bin *.stamp .tb.*.tags;\ + @rm -f *.[oad] *.bin *.stamp .tb.*.tags, *.rcd;\ list='$(SUBDIRS)'; for subdir in $$list; do \ echo "cleaning $$subdir"; \ $(MAKE) -C $$subdir clean; \ Modified: branches/unstable/padict/redesign/lib/hotlist/Makefile =================================================================== --- branches/unstable/padict/redesign/lib/hotlist/Makefile 2006-07-09 07:01:12 UTC (rev 750) +++ branches/unstable/padict/redesign/lib/hotlist/Makefile 2006-07-09 23:19:34 UTC (rev 751) @@ -52,7 +52,7 @@ $(MAKE) -C $@ clean: - @rm -f *.[oad] *.bin *.stamp;\ + @rm -f *.[oad] *.bin *.stamp *.rcd;\ list='$(SUBDIRS)'; for subdir in $$list; do \ echo "cleaning $$subdir"; \ $(MAKE) -C $$subdir clean; \ Modified: branches/unstable/padict/redesign/lib/preferences/preferencesNew.c =================================================================== --- branches/unstable/padict/redesign/lib/preferences/preferencesNew.c 2006-07-09 07:01:12 UTC (rev 750) +++ branches/unstable/padict/redesign/lib/preferences/preferencesNew.c 2006-07-09 23:19:34 UTC (rev 751) @@ -149,7 +149,7 @@ if (lRec->_Version != iVersion) { Char lBuf[maxStrIToALen+2]; - COMerror("Uncompatible version for pref id: ", StrIToA(lBuf, iID), " using default preferences"); + COMerror("Incompatible version for pref id: ", StrIToA(lBuf, iID), " using default preferences"); MemHandleUnlock(lHdl); DmReleaseResource(lHdl); return 0; @@ -205,7 +205,7 @@ if (lRec->_PrefSize != iPrefSize) { Char lBuf[maxStrIToALen+2]; - COMerror("Unexpected Size for preferences: ", StrIToA(lBuf, iID), " New Version?"); + COMerror("Unexpected size for preferences: ", StrIToA(lBuf, iID), " New Version?"); MemHandleUnlock(lHdl); lHdl = DmResizeResource (lHdl, iPrefSize + sizeof(PrefRecord)); ErrFatalDisplayIf(!lHdl, "can't resize preference record"); Modified: branches/unstable/padict/redesign/program/padict/result/Makefile =================================================================== --- branches/unstable/padict/redesign/program/padict/result/Makefile 2006-07-09 07:01:12 UTC (rev 750) +++ branches/unstable/padict/redesign/program/padict/result/Makefile 2006-07-09 23:19:34 UTC (rev 751) @@ -51,7 +51,7 @@ $(MAKE) -C $@ clean: - @rm -f *.[oad] *.bin *.stamp;\ + @rm -f *.[oad] *.bin *.stamp *.rcd;\ list='$(SUBDIRS)'; for subdir in $$list; do \ echo "cleaning $$subdir"; \ $(MAKE) -C $$subdir clean; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ben...@us...> - 2006-07-12 13:32:07
|
Revision: 753 Author: benoitcerrina Date: 2006-07-12 06:31:56 -0700 (Wed, 12 Jul 2006) ViewCVS: http://svn.sourceforge.net/padict/?rev=753&view=rev Log Message: ----------- jstroke correction Modified Paths: -------------- branches/unstable/padict/CHANGELOG branches/unstable/padict/stroke/Makefile branches/unstable/padict/stroke/unistrok.8 Modified: branches/unstable/padict/CHANGELOG =================================================================== --- branches/unstable/padict/CHANGELOG 2006-07-10 13:57:55 UTC (rev 752) +++ branches/unstable/padict/CHANGELOG 2006-07-12 13:31:56 UTC (rev 753) @@ -28,6 +28,8 @@ JIS: 0x316e, 0x3851, 0x472d add JIS: 0x4f35, 0x5f6a, 0x3d6c, 0x3262, 0x3264, 0x4d4c, 0x7321, 0x4566 +correct +JIS: 0x4566 0.3.3 => 0.9.0 support larger dictionary Modified: branches/unstable/padict/stroke/Makefile =================================================================== --- branches/unstable/padict/stroke/Makefile 2006-07-10 13:57:55 UTC (rev 752) +++ branches/unstable/padict/stroke/Makefile 2006-07-12 13:31:56 UTC (rev 753) @@ -7,7 +7,7 @@ perl ./compact.pl ./stroke2html.pl par c -v 2 jstroke.pdb strokedict BVok LGWS unistrok*.record - mv unistrok*.record tmp + mv -f unistrok*.record tmp clean: rm -f jstroke.pdb *.record \ Modified: branches/unstable/padict/stroke/unistrok.8 =================================================================== --- branches/unstable/padict/stroke/unistrok.8 2006-07-10 13:57:55 UTC (rev 752) +++ branches/unstable/padict/stroke/unistrok.8 2006-07-12 13:31:56 UTC (rev 753) @@ -320,4 +320,4 @@ 6797 0 | 6 2 1 3 6 2 1 3 #Benoit Cerrina add kanji #TOU sugiru cave -5b95 0 | 2 1 6 1 6 1 2 b 6 +5b95 0 | 2 1 61 6 1 2 b 6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ben...@us...> - 2006-07-16 17:19:47
|
Revision: 755 Author: benoitcerrina Date: 2006-07-16 10:19:37 -0700 (Sun, 16 Jul 2006) ViewCVS: http://svn.sourceforge.net/padict/?rev=755&view=rev Log Message: ----------- correct incorrect unicode for katakana zi Modified Paths: -------------- branches/unstable/padict/Makefile branches/unstable/padict/stroke_katakana/Makefile branches/unstable/padict/stroke_katakana/katakana.5 Modified: branches/unstable/padict/Makefile =================================================================== --- branches/unstable/padict/Makefile 2006-07-12 13:44:26 UTC (rev 754) +++ branches/unstable/padict/Makefile 2006-07-16 17:19:37 UTC (rev 755) @@ -167,7 +167,7 @@ .PHONY: nightly_deps nightly_deps: - svn update ; \ + svn update && \ $(MAKE) -C stroke && \ $(MAKE) -C stroke_hiragana && \ $(MAKE) -C stroke_katakana && \ Modified: branches/unstable/padict/stroke_katakana/Makefile =================================================================== --- branches/unstable/padict/stroke_katakana/Makefile 2006-07-12 13:44:26 UTC (rev 754) +++ branches/unstable/padict/stroke_katakana/Makefile 2006-07-16 17:19:37 UTC (rev 755) @@ -1,6 +1,6 @@ all: jstroke_k.pdb -jstroke_k.pdb: +jstroke_k.pdb: katakana.1 katakana.2 katakana.3 katakana.4 katakana.5 katakana.6 ./compact.pl ./stroke2html.pl par c jstroke_k.pdb katakanadict FVok LGWS unistrok*.record Modified: branches/unstable/padict/stroke_katakana/katakana.5 =================================================================== --- branches/unstable/padict/stroke_katakana/katakana.5 2006-07-12 13:44:26 UTC (rev 754) +++ branches/unstable/padict/stroke_katakana/katakana.5 2006-07-16 17:19:37 UTC (rev 755) @@ -9,7 +9,7 @@ 30b2 0000 | 1 6 1 3 3 # za, ji 30b6 0000 | 6 2 x 3 3 -30b9 0000 | 3 3 9 3 3 +30b8 0000 | 3 3 9 3 3 # da, ji, zu, de 30c0 0000 | 1 61 3 3 3 30c2 0000 | 4 6 x 3 3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ben...@us...> - 2006-12-08 03:30:06
|
Revision: 758
http://svn.sourceforge.net/padict/?rev=758&view=rev
Author: benoitcerrina
Date: 2006-12-07 19:30:06 -0800 (Thu, 07 Dec 2006)
Log Message:
-----------
add browse five page forward and backward + go to first and go to last buttons on the multi result display screen
Modified Paths:
--------------
branches/unstable/padict/Makefile
branches/unstable/padict/redesign/program/padict/result/RESMultidisplay.c
branches/unstable/padict/redesign/program/padict/result/resources.h
branches/unstable/padict/redesign/program/padict/result/result.rcp
branches/unstable/padict/redesign/program/padict/sod/SODForm.c
branches/unstable/padict/redesign/program/padict/sod/resources.h
branches/unstable/padict/redesign/program/padict/sod/sod.rcp
Modified: branches/unstable/padict/Makefile
===================================================================
--- branches/unstable/padict/Makefile 2006-11-08 03:57:11 UTC (rev 757)
+++ branches/unstable/padict/Makefile 2006-12-08 03:30:06 UTC (rev 758)
@@ -213,6 +213,7 @@
kanjizip.stamp: stroke/jstroke.pdb taka/taka.pdb
zip -j $(KANJI_NIGHTLY_ZIP) \
stroke/jstroke.pdb \
+ stroke_katakana/jstroke_k.pdb \
bin/radkfile.pdb \
taka/taka.pdb && \
touch kanjizip.stamp
Modified: branches/unstable/padict/redesign/program/padict/result/RESMultidisplay.c
===================================================================
--- branches/unstable/padict/redesign/program/padict/result/RESMultidisplay.c 2006-11-08 03:57:11 UTC (rev 757)
+++ branches/unstable/padict/redesign/program/padict/result/RESMultidisplay.c 2006-12-08 03:30:06 UTC (rev 758)
@@ -353,7 +353,31 @@
mdispc->_Id._RecordPosition=0;
mUpdateRecordDisplay();
}
- }
+ } else if (i > 0) //but not 1
+ {
+
+ PDICTrecord lRecordPosition = lId._RecordPosition; //being generous enough with the address space, I don't use a UInt
+ lId._RecordPosition = lRecordPosition + recordsPerSite() * i;
+ for (;DATACheckId(&lId) != data_id_valid && i >= 0; i--)
+ lId._RecordPosition = lRecordPosition + recordsPerSite() * i;
+ //if (DATACheckId(&lId) != data_id_valid)
+ // return;
+
+ if (DATACheckId(&lId) != data_id_valid)
+ return;
+ mdispc->_Id._RecordPosition = lId._RecordPosition;
+ mUpdateRecordDisplay();
+ } else if (i < 0)
+ {
+ if (lId._RecordPosition >= recordsPerSite() * i * (-1))
+ lId._RecordPosition -= recordsPerSite() * i * (-1);
+ else
+ lId._RecordPosition = 0;
+ //if (DATACheckId(&lId) != data_id_valid)
+ // return;
+ mdispc->_Id._RecordPosition = lId._RecordPosition;
+ mUpdateRecordDisplay();
+ }
}
static void vertPos(FormPtr frm, UInt16 iID, Coord iOffset) RES_SECTION;
@@ -600,7 +624,8 @@
break;
case keyDownEvent:
- switch(event->data.keyDown.chr){
+ switch(event->data.keyDown.chr)
+ {
case vchrPageDown: //PageUpKey. Is there a constant?!?!
mswitch_position(1);
break;
@@ -644,13 +669,28 @@
}
break;
case ctlSelectEvent:
- switch(event->data.ctlSelect.controlID) {
+ switch(event->data.ctlSelect.controlID)
+ {
+ case d_buttonID_start:
+ mdispc->_Id._RecordPosition=0;
+ mUpdateRecordDisplay();
+ break;
+ case d_buttonID_end:
+ mdispc->_Id._RecordPosition = (DATANumRecords(&mdispc->_Id) / recordsPerSite()) * recordsPerSite();
+ mUpdateRecordDisplay();
+ break;
+ case d_buttonID_next5:
+ mswitch_position(5);
+ break;
case d_buttonID_next:
mswitch_position(1);
break;
case d_buttonID_previous:
mswitch_position(-1);
break;
+ case d_buttonID_prev5:
+ mswitch_position(-5);
+ break;
case d_buttonID_search_meaning:
COMFrmGotoFormNoFlicker(formID_dbdict_search_default_rom);
break;
Modified: branches/unstable/padict/redesign/program/padict/result/resources.h
===================================================================
--- branches/unstable/padict/redesign/program/padict/result/resources.h 2006-11-08 03:57:11 UTC (rev 757)
+++ branches/unstable/padict/redesign/program/padict/result/resources.h 2006-12-08 03:30:06 UTC (rev 758)
@@ -41,6 +41,10 @@
#define d_buttonID_previous (sk_gadgetID_english-1)
//this is sk_gadgetID_multiradical+1
#define d_buttonID_next 5216
+#define d_buttonID_next5 5217
+#define d_buttonID_prev5 5218
+#define d_buttonID_start 5219
+#define d_buttonID_end 5220
#define d_buttonID_search_reading 1305
#define d_buttonID_search_kanji 1308
Modified: branches/unstable/padict/redesign/program/padict/result/result.rcp
===================================================================
--- branches/unstable/padict/redesign/program/padict/result/result.rcp 2006-11-08 03:57:11 UTC (rev 757)
+++ branches/unstable/padict/redesign/program/padict/result/result.rcp 2006-12-08 03:30:06 UTC (rev 758)
@@ -149,8 +149,12 @@
BEGIN
TITLE "PAdict"
- BUTTON "S" ID d_buttonID_single AT (65 1 16 10) USABLE FRAME FONT 0
-
+ BUTTON "A" ID d_buttonID_start AT (42 1 10 10) USABLE FRAME FONT 0
+ BUTTON "{" ID d_buttonID_prev5 AT (PREVRIGHT+3 1 10 10) USABLE FRAME FONT 0
+ BUTTON "S" ID d_buttonID_single AT (PREVRIGHT+3 1 10 10) USABLE FRAME FONT 0
+ BUTTON "}" ID d_buttonID_next5 AT (PREVRIGHT+3 1 10 10) USABLE FRAME FONT 0
+ BUTTON "Z" ID d_buttonID_end AT (PREVRIGHT+3 1 10 10) USABLE FRAME FONT 0
+
POPUPTRIGGER "" ID d_popuptrID_cat AT (159 1 1 AUTO) USABLE RIGHTANCHOR
LIST "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" ID d_popuptrID_catlist AT (PREVLEFT PREVTOP 60 0) NONUSABLE
Modified: branches/unstable/padict/redesign/program/padict/sod/SODForm.c
===================================================================
--- branches/unstable/padict/redesign/program/padict/sod/SODForm.c 2006-11-08 03:57:11 UTC (rev 757)
+++ branches/unstable/padict/redesign/program/padict/sod/SODForm.c 2006-12-08 03:30:06 UTC (rev 758)
@@ -376,6 +376,21 @@
processed = true;
}
break;
+ /*
+ case SODFontButton:
+ {
+ EventType lEvent;
+ if (sDrawing)
+ {
+ stopSODDrawing();
+ }
+
+ lEvent.eType = frmUpdateEvent;
+ EvtAddEventToQueue(&lEvent);
+ processed = true;
+ break;
+ }
+ */
case SODFastCheck:
{
sDrawOrder._DoubleBuffer = FrmGetControlValue(frm, COMFrmGetObjectIndex(frm, SODFastCheck));
@@ -389,7 +404,7 @@
EventType lEvent;
if (sDrawing)
{
- stopSODDrawing();
+ stopSODDrawing();
}
lEvent.eType = frmUpdateEvent;
EvtAddEventToQueue(&lEvent);
Modified: branches/unstable/padict/redesign/program/padict/sod/resources.h
===================================================================
--- branches/unstable/padict/redesign/program/padict/sod/resources.h 2006-11-08 03:57:11 UTC (rev 757)
+++ branches/unstable/padict/redesign/program/padict/sod/resources.h 2006-12-08 03:30:06 UTC (rev 758)
@@ -11,6 +11,7 @@
#define SODFastCheck 9950
#define SODStrokeLabel 9951
#define SODDoneButton 9952
+#define SODFontButton 3945
#define SODMenu 9954
#define alertID_NoTakaDB 9996
#define alertID_NotInTAKA 9997
Modified: branches/unstable/padict/redesign/program/padict/sod/sod.rcp
===================================================================
--- branches/unstable/padict/redesign/program/padict/sod/sod.rcp 2006-11-08 03:57:11 UTC (rev 757)
+++ branches/unstable/padict/redesign/program/padict/sod/sod.rcp 2006-12-08 03:30:06 UTC (rev 758)
@@ -60,6 +60,7 @@
BEGIN
TITLE "Stroke Order Diagram"
BUTTON "Done" ID SODDoneButton AT (120 BOTTOM@144 35 AUTO)
+ //BUTTON "Font" ID SODFontButton AT (120 BOTTOM@105 35 AUTO)
LABEL " " ID SODStrokeLabel AT (121 42)
CHECKBOX "Fast" ID SODFastCheck AT (118 PREVBOTTOM+2 AUTO AUTO)
CHECKBOX "Num" ID SODNumbersCheck AT (PREVLEFT PREVBOTTOM+2 AUTO AUTO)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X